diff options
| author | Moyster <oysterized@gmail.com> | 2016-09-10 00:40:41 +0200 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2016-09-10 00:40:41 +0200 |
| commit | 34ff7a30a0524d4a2c913ad15dfc4de3b578ff26 (patch) | |
| tree | 6948246bc1956b6bbc495e67de11dcd2b75505dc | |
| parent | df59686b10e31718be0a269e1556e5f5c0ad6e6f (diff) | |
fix conflict
| -rw-r--r-- | block/Kconfig.iosched | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched index 2628bb8e8..ec8a0ed8b 100644 --- a/block/Kconfig.iosched +++ b/block/Kconfig.iosched @@ -67,28 +67,6 @@ config CFQ_GROUP_IOSCHED ---help--- Enable group IO scheduling in CFQ. -<<<<<<< HEAD -======= -config IOSCHED_BFQ - tristate "BFQ I/O scheduler" - default n - ---help--- - The BFQ I/O scheduler tries to distribute bandwidth among - all processes according to their weights. - It aims at distributing the bandwidth as desired, independently of - the disk parameters and with any workload. It also tries to - guarantee low latency to interactive and soft real-time - applications. If compiled built-in (saying Y here), BFQ can - be configured to support hierarchical scheduling. - -config CGROUP_BFQIO - bool "BFQ hierarchical scheduling support" - depends on CGROUPS && IOSCHED_BFQ=y - default n - ---help--- - Enable hierarchical scheduling in BFQ, using the cgroups - filesystem interface. The name of the subsystem will be - bfqio. config IOSCHED_SIOPLUS tristate "Simple I/O scheduler plus" |