Commit cff3ba22 authored by Zachary Amsden's avatar Zachary Amsden Committed by Jens Axboe

[BLOCK] elevator init fixes #2

In addition to the first patch, which is probably goodness, I found the
cause of my panic - applying this patch fixes it and now I am booting.
If the chosen_elevator[] is not found, fall back to noop.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJens Axboe <axboe@suse.de>
parent b8ea2cb5
...@@ -155,9 +155,10 @@ static void elevator_setup_default(void) ...@@ -155,9 +155,10 @@ static void elevator_setup_default(void)
/* /*
* If the given scheduler is not available, fall back to no-op. * If the given scheduler is not available, fall back to no-op.
*/ */
if (!(e = elevator_find(chosen_elevator))) if ((e = elevator_find(chosen_elevator)))
strcpy(chosen_elevator, "noop");
elevator_put(e); elevator_put(e);
else
strcpy(chosen_elevator, "noop");
} }
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