uml: fixup allocation in the ubd driver

Sanitise gfp flags; it actually is an atomic context, so drop the
GFP_KERNEL part.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 9200a457eb9887c035a8464d77ff7801e069a40f..88a246edb61eb00a9be6f6c1cde64c735f33cfbf 100644 (file)
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -1102,7 +1102,7 @@ static void do_ubd_request(request_queue_t *q)
                        struct scatterlist *sg = &dev->sg[dev->start_sg];
 
                        io_req = kmalloc(sizeof(struct io_thread_req),
-                                        GFP_KERNEL | GFP_ATOMIC);
+                                        GFP_ATOMIC);
                        if(io_req == NULL){
                                if(list_empty(&dev->restart))
                                        list_add(&dev->restart, &restart);