From 2dc27f01ec3990d79fc97386459191fc3da2b02f Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 15 Oct 2007 23:28:20 +0200
Subject: x86: apply missing DMA/OOM prevention to floppy_32.h
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'include')
diff --git a/include/asm-x86/floppy_32.h b/include/asm-x86/floppy_32.h
index 99583b39d2..cca9be7f6c 100644
--- a/include/asm-x86/floppy_32.h
+++ b/include/asm-x86/floppy_32.h
@@ -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));
}
--
cgit v1.2.2