From 5f93f54000af681efaef17eae9ed202c57a3ec5a Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 15 Oct 2007 23:28:20 +0200
Subject: [PATCH] --- yaml --- r: 71037 b: refs/heads/master c:
 2dc27f01ec3990d79fc97386459191fc3da2b02f h: refs/heads/master i:   71035:
 4287f4e6b15d4483366c7a7335eacde89c30d4f4 v: v3

---
 [refs]                            | 2 +-
 trunk/include/asm-x86/floppy_32.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 59e299db6727..0da2971c4672 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 106619c440a7cd5a100eaba38665231ab8c762b8
+refs/heads/master: 2dc27f01ec3990d79fc97386459191fc3da2b02f
diff --git a/trunk/include/asm-x86/floppy_32.h b/trunk/include/asm-x86/floppy_32.h
index 99583b39d216..cca9be7f6c81 100644
--- a/trunk/include/asm-x86/floppy_32.h
+++ b/trunk/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));
 }