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));
 }