2007-05-01 19:56:01

by Peter Zijlstra

[permalink] [raw]
Subject: [PATCH] uml: fixup allocation in the ubd driver

I needed this for 2.6.21-rc7-mm2, ubd was complaining about sleeping in
an atomic context.
---

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

Signed-off-by: Peter Zijlstra <[email protected]>
Acked-by: Jeff Dike <[email protected]>
---
arch/um/drivers/ubd_kern.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/arch/um/drivers/ubd_kern.c
===================================================================
--- linux-2.6.orig/arch/um/drivers/ubd_kern.c 2007-05-01 21:41:13.000000000 +0200
+++ linux-2.6/arch/um/drivers/ubd_kern.c 2007-05-01 21:49:23.000000000 +0200
@@ -1102,7 +1102,7 @@ static void do_ubd_request(request_queue
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);