diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-16 23:43:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-16 23:43:11 -0800 |
| commit | fb60a9fee970a1159a006abddc33e9685f89a83e (patch) | |
| tree | 618acfde015fdfa9c8710bd9fd58ce0f75571a70 /block/elevator.c | |
| parent | f4caf1606d3bbe3a790997e3dc5bb2779c6b7daf (diff) | |
| parent | b7bfcf7cbd58d2a64aa46f3b4bec921e346e604f (diff) | |
| download | linux-3.10-fb60a9fee970a1159a006abddc33e9685f89a83e.tar.gz linux-3.10-fb60a9fee970a1159a006abddc33e9685f89a83e.tar.bz2 linux-3.10-fb60a9fee970a1159a006abddc33e9685f89a83e.zip | |
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/elevator.c b/block/elevator.c index e8025b2ec54..c9f424d5399 100644 --- 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) |