---

yaml --- r: 54319 b: refs/heads/master c: 990c558 h: refs/heads/master i: 54317: 694dd65 54315: 6a8e3b3 54311: ef9aa0d 54303: eb75cd3 v: v3
git-mirror · May 7, 2007 · eab44f0 · eab44f0
1 parent cb87e6c
commit eab44f0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);