[BLOCK] elevator: if specified scheduler is not found, fall back to default

[linux-2.6-omap-h63xx.git] / block / elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index e8025b2ec54a508a1bd5db7a23c9ff687e8923b4..c9f424d5399c55b588779f252e8bb41b0fe51410 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -157,12 +157,12 @@ static void elevator_setup_default(void)
                strcpy(chosen_elevator, "anticipatory");
 
        /*
-        * If the given scheduler is not available, fall back to no-op.
+        * If the given scheduler is not available, fall back to the default
         */
        if ((e = elevator_find(chosen_elevator)))
                elevator_put(e);
        else
-               strcpy(chosen_elevator, "noop");
+               strcpy(chosen_elevator, CONFIG_DEFAULT_IOSCHED);
 }
 
 static int __init elevator_setup(char *str)