diff options
| author | Peter Zijlstra <pzijlstr@redhat.com> | 2007-05-06 14:51:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 12:13:03 -0700 |
| commit | 990c55871b655156ffd7787af791be977d946ef6 (patch) | |
| tree | 3c3e7dde856c1a70706e84afd1ca8b0a9b82ec71 /arch/um | |
| parent | 2adcec2197897365e0a0f657f1098cbfdb44bc8b (diff) | |
| download | blackbird-op-linux-990c55871b655156ffd7787af791be977d946ef6.tar.gz blackbird-op-linux-990c55871b655156ffd7787af791be977d946ef6.zip | |
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>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/drivers/ubd_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index 9200a457eb98..88a246edb61e 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); |
