Skip to content

L
linux-davinci
Commit fb60a9fe authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

parents f4caf160 b7bfcf7c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 273 additions and 2 deletions
Documentation/block/barrier.txt 0 → 100644
View file @ fb60a9fe
This diff is collapsed.
block/elevator.c
View file @ fb60a9fe
...@@ -157,12 +157,12 @@ static void elevator_setup_default(void) ...@@ -157,12 +157,12 @@ static void elevator_setup_default(void)
strcpy(chosen_elevator, "anticipatory"); 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))) if ((e = elevator_find(chosen_elevator)))
elevator_put(e); elevator_put(e);
else else
strcpy(chosen_elevator, "noop"); strcpy(chosen_elevator, CONFIG_DEFAULT_IOSCHED);
} }
static int __init elevator_setup(char *str) static int __init elevator_setup(char *str)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment