Commit 554d284b authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[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: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 28456ede
...@@ -155,7 +155,7 @@ static int fd_request_irq(void) ...@@ -155,7 +155,7 @@ static int fd_request_irq(void)
static unsigned long dma_mem_alloc(unsigned long size) 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));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment