Skip to content

Commit

Permalink
[PATCH] x86_64: Don't invoke OOM killer while allocating floppy DMA b…
Browse files Browse the repository at this point in the history
…uffers

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>
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Mar 25, 2006
1 parent 28456ed commit 554d284
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion include/asm-x86_64/floppy.h
Original file line number Diff 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

0 comments on commit 554d284

Please sign in to comment.