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 0600a37ba835753422851c1446aaa5b29055aa24..debe9119b7241ecbce6fa0992975f079b5a24aad 100644 (file)
--- 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;