[PATCH] uml: Avoid forcing use of the no-op scheduler

Avoid forcing use of the no-op scheduler for UBD; this may uncover some
bugs in the UBD driver, and in fact uml-ubd-no-empty-queue.patch is needed
to make this sure.  But as of now, no other bugs have been discovered, so
this should be safe.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index f680e246813d1f8aa42fbd1385abb7ce12c88713..1e7ba0e5284a16eb31910f9e462da9f7f367bc62 100644 (file)
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -749,8 +749,6 @@ int ubd_init(void)
                return -1;
        }
                
-       elevator_init(ubd_queue, &elevator_noop);
-
        if (fake_major != MAJOR_NR) {
                char name[sizeof("ubd_nnn\0")];