Commit:     990c55871b655156ffd7787af791be977d946ef6
Parent:     2adcec2197897365e0a0f657f1098cbfdb44bc8b
Author:     Peter Zijlstra <[EMAIL PROTECTED]>
AuthorDate: Sun May 6 14:51:38 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon May 7 12:13:03 2007 -0700

    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 <[EMAIL PROTECTED]>
    Acked-by: Jeff Dike <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 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 9200a45..88a246e 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){
                                        list_add(&dev->restart, &restart);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to