From 42b3758bfbb85f910afea98eafe12a80cbdd2263 Mon Sep 17 00:00:00 2001
From: Glauber Costa <gcosta@redhat.com>
Date: Tue, 8 Apr 2008 13:21:05 -0300
Subject: [PATCH] --- yaml --- r: 91036 b: refs/heads/master c:
 8779f2fc3b84ebb6c5181fb13d702e9944c16069 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/pci-dma_32.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7984845dd00d..eb1232eba987 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45a07e774950ef479f8996c0e2c5550dd6440453
+refs/heads/master: 8779f2fc3b84ebb6c5181fb13d702e9944c16069
diff --git a/trunk/arch/x86/kernel/pci-dma_32.c b/trunk/arch/x86/kernel/pci-dma_32.c
index 0600a37ba835..debe9119b724 100644
--- a/trunk/arch/x86/kernel/pci-dma_32.c
+++ b/trunk/arch/x86/kernel/pci-dma_32.c
@@ -82,9 +82,6 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
 	if (dma_alloc_from_coherent_mem(dev, size, dma_handle, &ret))
 		return ret;
 
-	if (dev == NULL || (dev->coherent_dma_mask < 0xffffffff))
-		gfp |= GFP_DMA;
-
 	if (!dev)
 		dev = &fallback_dev;