[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: Andrew Morton <akpm@osdl.org> Signed-off-by: Jens Axboe <axboe@suse.de>
This commit is contained in:
parent
b8ea2cb512
commit
cff3ba2204
1 changed files with 3 additions and 2 deletions
|
@ -155,9 +155,10 @@ static void elevator_setup_default(void)
|
|||
/*
|
||||
* If the given scheduler is not available, fall back to no-op.
|
||||
*/
|
||||
if (!(e = elevator_find(chosen_elevator)))
|
||||
if ((e = elevator_find(chosen_elevator)))
|
||||
elevator_put(e);
|
||||
else
|
||||
strcpy(chosen_elevator, "noop");
|
||||
elevator_put(e);
|
||||
}
|
||||
|
||||
static int __init elevator_setup(char *str)
|
||||
|
|
Loading…
Reference in a new issue