diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-11-26 17:06:19 +0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-11-26 17:06:19 +0300 |
commit | 2ea352d5960ad469f5712cf3e293db97beac4e01 (patch) | |
tree | c24ae19073f2884867b310ee193d36a82075b60f /block/Kconfig.iosched | |
parent | ceb9e77324fa661b1001a0ae66f061b5fcb4e4e6 (diff) | |
parent | be2eca94d144e3ffed565c483a58ecc76a869c98 (diff) | |
download | linux-2ea352d5960ad469f5712cf3e293db97beac4e01.tar.xz |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up BPF changes we'll need.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'block/Kconfig.iosched')
-rw-r--r-- | block/Kconfig.iosched | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched index b89310a022ad..7df14133adc8 100644 --- a/block/Kconfig.iosched +++ b/block/Kconfig.iosched @@ -31,6 +31,7 @@ config IOSCHED_BFQ config BFQ_GROUP_IOSCHED bool "BFQ hierarchical scheduling support" depends on IOSCHED_BFQ && BLK_CGROUP + select BLK_CGROUP_RWSTAT ---help--- Enable hierarchical scheduling in BFQ, using the blkio |