---

yaml --- r: 23823 b: refs/heads/master c: 554d284 h: refs/heads/master i: 23821: 2ff61d2 23819: 9d3b399 23815: 51bae8e 23807: 133761b v: v3
git-mirror · Mar 25, 2006 · ab955dd · ab955dd
1 parent bdf27d1
commit ab955dd
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: 28456edeff2ef9273c55cd12e4b193208717d4cd
+refs/heads/master: 554d284ba90bc2306c31e5363789f05c320969c3
diff --git a/trunk/include/asm-x86_64/floppy.h b/trunk/include/asm-x86_64/floppy.h
@@ -155,7 +155,7 @@ static int fd_request_irq(void)
 
 static unsigned long dma_mem_alloc(unsigned long size)
 {
-	return __get_dma_pages(GFP_KERNEL,get_order(size));
+	return __get_dma_pages(GFP_KERNEL|__GFP_NORETRY,get_order(size));
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -155,7 +155,7 @@ static int fd_request_irq(void) @@
     static unsigned long dma_mem_alloc(unsigned long size)
     {
-    	return __get_dma_pages(GFP_KERNEL,get_order(size));
+    	return __get_dma_pages(GFP_KERNEL|__GFP_NORETRY,get_order(size));
     }
@@ Expand Down @@