diff options
| author | Andi Kleen <ak@suse.de> | 2006-03-25 16:30:40 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 18:10:55 +0100 |
| commit | 554d284ba90bc2306c31e5363789f05c320969c3 (patch) | |
| tree | 8fb67f8c7bed5c6525a060b094ff461fb4bfb104 /include/asm-x86_64 | |
| parent | [PATCH] x86_64: Reename CMOS update warning (diff) | |
| download | linux-554d284ba90bc2306c31e5363789f05c320969c3.tar.xz linux-554d284ba90bc2306c31e5363789f05c320969c3.zip | |
[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>
Diffstat (limited to 'include/asm-x86_64')
| -rw-r--r-- | include/asm-x86_64/floppy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/floppy.h b/include/asm-x86_64/floppy.h index af7ded63b517..52825ce689f2 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)); } |