summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-04-08 13:21:05 -0300
committerIngo Molnar <mingo@elte.hu>2008-04-19 19:19:58 +0200
commit8779f2fc3b84ebb6c5181fb13d702e9944c16069 (patch)
tree229635546ea18cac1498e2f4641ecdd449b76d24 /arch
parent45a07e774950ef479f8996c0e2c5550dd6440453 (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/pci-dma_32.c3
1 files changed, 0 insertions, 3 deletions
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;