[PATCH] block cleanups: Add kconfig default iosched submenu

Add a kconfig submenu to select the default I/O scheduler, in case
anticipatory is not compiled in or another default is preferred.  Also,
since no-op is always available, we should use it whenever the selected
default is not.

Signed-off-by: Nate Diller <nate@namesys.com>
Acked-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 28 insertions, 0 deletions

diff --git a/drivers/block/Kconfig.iosched b/drivers/block/Kconfig.iosched
index 6070a480600b..5b90d2fa63b8 100644
--- a/drivers/block/Kconfig.iosched
+++ b/drivers/block/Kconfig.iosched
@@ -38,4 +38,32 @@ config IOSCHED_CFQ
           among all processes in the system. It should provide a fair
           working environment, suitable for desktop systems.
 
+choice
+        prompt "Default I/O scheduler"
+        default DEFAULT_AS
+        help
+          Select the I/O scheduler which will be used by default for all
+          block devices.
+
+        config DEFAULT_AS
+                bool "Anticipatory" if IOSCHED_AS
+
+        config DEFAULT_DEADLINE
+                bool "Deadline" if IOSCHED_DEADLINE
+
+        config DEFAULT_CFQ
+                bool "CFQ" if IOSCHED_CFQ
+
+        config DEFAULT_NOOP
+                bool "No-op"
+
+endchoice
+
+config DEFAULT_IOSCHED
+        string
+        default "anticipatory" if DEFAULT_AS
+        default "deadline" if DEFAULT_DEADLINE
+        default "cfq" if DEFAULT_CFQ
+        default "noop" if DEFAULT_NOOP
+
 endmenu