[PATCH] [36/66] x86_64: Don't invoke OOM killer while allocating floppy DMA buffers

["Andi Kleen" <ak@xxxxxxx>]

Floppy can fall back to smaller buffers, so don't do OOM killing.

Signed-off-by: Andi Kleen <ak@xxxxxxx>

---
 include/asm-x86_64/floppy.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux/include/asm-x86_64/floppy.h
===================================================================
--- linux.orig/include/asm-x86_64/floppy.h
+++ linux/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));
 }
 
 
-
: send the line "unsubscribe linux-x86_64" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html