From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 15 Oct 2007 21:28:20 +0000 (+0200)
Subject: x86: apply missing DMA/OOM prevention to floppy_32.h
X-Git-Tag: v2.6.24-rc1~476^2~15
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=2dc27f01ec3990d79fc97386459191fc3da2b02f;p=~andy%2Flinux

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>
---

diff --git a/include/asm-x86/floppy_32.h b/include/asm-x86/floppy_32.h
index 99583b39d21..cca9be7f6c8 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));
 }