From eab44f0efb0eca4a71a7b5856a8fc7990aa8f3ee Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <pzijlstr@redhat.com>
Date: Sun, 6 May 2007 14:51:38 -0700
Subject: [PATCH] --- yaml --- r: 54319 b: refs/heads/master c:
 990c55871b655156ffd7787af791be977d946ef6 h: refs/heads/master i:   54317:
 694dd653b3b2bb9b319e1e78ff3d36cb0fb73742   54315:
 6a8e3b3bffac2c11505dca90f79bdeca9d0df223   54311:
 ef9aa0d524e5a26900eb4895f3999a250255d637   54303:
 eb75cd3f25533fdfcce7094d1516ba2450fab3e5 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/um/drivers/ubd_kern.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c2e2689ead4d..10b4bd9f0ed3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2adcec2197897365e0a0f657f1098cbfdb44bc8b
+refs/heads/master: 990c55871b655156ffd7787af791be977d946ef6
diff --git a/trunk/arch/um/drivers/ubd_kern.c b/trunk/arch/um/drivers/ubd_kern.c
index 9200a457eb98..88a246edb61e 100644
--- a/trunk/arch/um/drivers/ubd_kern.c
+++ b/trunk/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);