From: Peter Zijlstra Date: Sun, 6 May 2007 21:51:38 +0000 (-0700) Subject: uml: fixup allocation in the ubd driver X-Git-Tag: v2.6.22-rc1~847 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=990c55871b655156ffd7787af791be977d946ef6;p=linux-2.6-omap-h63xx.git 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 Acked-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index 9200a457eb9..88a246edb61 100644 --- 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);