From: Glauber Costa <gcosta@redhat.com>
Date: Tue, 8 Apr 2008 16:21:05 +0000 (-0300)
Subject: x86: don't try to allocate from DMA zone at first
X-Git-Tag: v2.6.26-rc1~1133^2~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8779f2fc3b84ebb6c5181fb13d702e9944c16069;p=linux-2.6-omap-h63xx.git

x86: don't try to allocate from DMA zone at first

If we fail, we'll loop into the allocation again,
and then allocate in the DMA zone.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/arch/x86/kernel/pci-dma_32.c b/arch/x86/kernel/pci-dma_32.c
index 0600a37ba83..debe9119b72 100644
--- a/arch/x86/kernel/pci-dma_32.c
+++ b/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;