From: Jens Axboe <axboe@suse.de>
Date: Fri, 4 Nov 2005 07:44:58 +0000 (+0100)
Subject: [BLOCK] iosched: fix setting of default io scheduler
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c6ea2ba7b8acdb6c4a883b2d38607c8078dff4ee;p=linux-beck.git

[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>
---

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"