diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 02:43:11 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 02:43:11 -0500 |
| commit | fb60a9fee970a1159a006abddc33e9685f89a83e (patch) | |
| tree | 618acfde015fdfa9c8710bd9fd58ce0f75571a70 /block | |
| parent | f4caf1606d3bbe3a790997e3dc5bb2779c6b7daf (diff) | |
| parent | b7bfcf7cbd58d2a64aa46f3b4bec921e346e604f (diff) | |
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
Diffstat (limited to 'block')
| -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 e8025b2ec54a..c9f424d5399c 100644 --- a/block/elevator.c +++ b/block/elevator.c | |||
| @@ -157,12 +157,12 @@ static void elevator_setup_default(void) | |||
| 157 | strcpy(chosen_elevator, "anticipatory"); | 157 | strcpy(chosen_elevator, "anticipatory"); |
| 158 | 158 | ||
| 159 | /* | 159 | /* |
| 160 | * If the given scheduler is not available, fall back to no-op. | 160 | * If the given scheduler is not available, fall back to the default |
| 161 | */ | 161 | */ |
| 162 | if ((e = elevator_find(chosen_elevator))) | 162 | if ((e = elevator_find(chosen_elevator))) |
| 163 | elevator_put(e); | 163 | elevator_put(e); |
| 164 | else | 164 | else |
| 165 | strcpy(chosen_elevator, "noop"); | 165 | strcpy(chosen_elevator, CONFIG_DEFAULT_IOSCHED); |
| 166 | } | 166 | } |
| 167 | 167 | ||
| 168 | static int __init elevator_setup(char *str) | 168 | static int __init elevator_setup(char *str) |