From ab955dd9ab6835d22fa6be77c77bfa29ea95db93 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Sat, 25 Mar 2006 16:30:40 +0100
Subject: [PATCH] --- yaml --- r: 23823 b: refs/heads/master c:
 554d284ba90bc2306c31e5363789f05c320969c3 h: refs/heads/master i:   23821:
 2ff61d28920f0b66b73ba073c7c8e876d705e89b   23819:
 9d3b3992db22bfa2ec89e077f1c75621c1776df2   23815:
 51bae8eb317dc7567c9aa7f8992c08011b520a57   23807:
 133761bfd801d126ea8929bfe1ac220d6d32faab v: v3

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

diff --git a/[refs] b/[refs]
index 648ac29d2f15..f2007c186448 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28456edeff2ef9273c55cd12e4b193208717d4cd
+refs/heads/master: 554d284ba90bc2306c31e5363789f05c320969c3
diff --git a/trunk/include/asm-x86_64/floppy.h b/trunk/include/asm-x86_64/floppy.h
index af7ded63b517..52825ce689f2 100644
--- a/trunk/include/asm-x86_64/floppy.h
+++ b/trunk/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));
 }