]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
x86: apply missing DMA/OOM prevention to floppy_32.h
authorThomas Gleixner <tglx@linutronix.de>
Mon, 15 Oct 2007 21:28:20 +0000 (23:28 +0200)
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>
Wed, 17 Oct 2007 18:17:22 +0000 (20:17 +0200)
commit 554d284ba90bc2306c31e5363789f05c320969c3 added _GPF_NORETRY
to floppy_64.h to prevent OOM killer on floppy DMA allocations.

Apply the same to the 32 bit variant.

Found during the attempt to unify the _32/_64 variants. Seperate commit
to document the resulting code change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
include/asm-x86/floppy_32.h

index 99583b39d2163e27e90c88cbec0450af786c46f2..cca9be7f6c813b70a49e2c9da287474537675ca7 100644 (file)
@@ -154,7 +154,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));
 }