summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <axboe@suse.de>2005-11-04 08:44:58 +0100
committerJens Axboe <axboe@suse.de>2005-11-04 08:44:58 +0100
commitc6ea2ba7b8acdb6c4a883b2d38607c8078dff4ee (patch)
treed175d3c28c0ff28cee62a4073c48f96b029cacab
parent[BLOCK] Move all core block layer code to new block/ directory (diff)
downloadlinux-c6ea2ba7b8acdb6c4a883b2d38607c8078dff4ee.tar.xz
linux-c6ea2ba7b8acdb6c4a883b2d38607c8078dff4ee.zip
[BLOCK] iosched: fix setting of default io scheduler
With the recent reorg of the io scheduler selection, it unfortunately became possible to select an io scheduler to be the default even if it wasn't builtin. Fix this by requiring the default scheduler to be builtin. Signed-off-by: Jens Axboe <axboe@suse.de>
-rw-r--r--block/Kconfig.iosched6
1 files changed, 3 insertions, 3 deletions
diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
index 5b90d2fa63b8..f3b7753aac99 100644
--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
@@ -46,13 +46,13 @@ choice
block devices.
config DEFAULT_AS
- bool "Anticipatory" if IOSCHED_AS
+ bool "Anticipatory" if IOSCHED_AS=y
config DEFAULT_DEADLINE
- bool "Deadline" if IOSCHED_DEADLINE
+ bool "Deadline" if IOSCHED_DEADLINE=y
config DEFAULT_CFQ
- bool "CFQ" if IOSCHED_CFQ
+ bool "CFQ" if IOSCHED_CFQ=y
config DEFAULT_NOOP
bool "No-op"