From: Andi Kleen <ak@suse.de>
Date: Sat, 25 Mar 2006 15:30:40 +0000 (+0100)
Subject: [PATCH] x86_64: Don't invoke OOM killer while allocating floppy DMA buffers
X-Git-Tag: v2.6.17-rc1~695
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=554d284ba90bc2306c31e5363789f05c320969c3;p=linux-2.6

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

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

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/include/asm-x86_64/floppy.h b/include/asm-x86_64/floppy.h
index af7ded63b5..52825ce689 100644
--- a/include/asm-x86_64/floppy.h
+++ b/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));
 }