From 59a3d3329c221cf8a0e9534fe9e0b3be26257270 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Fri, 3 Feb 2006 21:50:59 +0100
Subject: [PATCH] --- yaml --- r: 19767 b: refs/heads/master c:
 6bca52b544489b626c7d0db801df6b4aa3d5adb5 h: refs/heads/master i:   19765:
 b9e74c7ae3348d3eb979854c2bec613f9beb4194   19763:
 fa580e91abb44b952126ae96e61681873bbe5a61   19759:
 10472f0deec320505bc46c7ad69b2b7ba9bd7743 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86_64/kernel/pci-dma.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f2d7e5bd3293..7b052fb2b81a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dd2ea9af8f0eca43cf6200baa182b3aba307049
+refs/heads/master: 6bca52b544489b626c7d0db801df6b4aa3d5adb5
diff --git a/trunk/arch/x86_64/kernel/pci-dma.c b/trunk/arch/x86_64/kernel/pci-dma.c
index 2f5d8328e2b9..4ed391edd47a 100644
--- a/trunk/arch/x86_64/kernel/pci-dma.c
+++ b/trunk/arch/x86_64/kernel/pci-dma.c
@@ -107,6 +107,9 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
 				goto again;
 			}
 
+			/* Let low level make its own zone decisions */
+			gfp &= ~(GFP_DMA32|GFP_DMA);
+
 			if (dma_ops->alloc_coherent)
 				return dma_ops->alloc_coherent(dev, size,
 							   dma_handle, gfp);