]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] x86_64: Don't invoke OOM killer while allocating floppy DMA buffers
authorAndi Kleen <ak@suse.de>
Sat, 25 Mar 2006 15:30:40 +0000 (16:30 +0100)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 25 Mar 2006 17:10:55 +0000 (09:10 -0800)
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>
include/asm-x86_64/floppy.h

index af7ded63b51737f4b3874ed9601a189b3cd58465..52825ce689f21a3f897641fa042f52fd4be4b1bd 100644 (file)
@@ -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));
 }