summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/pci-dma_32.c
diff options
context:
space:
mode:
authorGlauber Costa2008-04-08 18:21:05 +0200
committerIngo Molnar2008-04-19 19:19:58 +0200
commit8779f2fc3b84ebb6c5181fb13d702e9944c16069 (patch)
tree229635546ea18cac1498e2f4641ecdd449b76d24 /arch/x86/kernel/pci-dma_32.c
parentx86: use a fallback dev for i386 (diff)
downloadkernel-qcow2-linux-8779f2fc3b84ebb6c5181fb13d702e9944c16069.tar.gz
kernel-qcow2-linux-8779f2fc3b84ebb6c5181fb13d702e9944c16069.tar.xz
kernel-qcow2-linux-8779f2fc3b84ebb6c5181fb13d702e9944c16069.zip
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/x86/kernel/pci-dma_32.c')
-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 0600a37ba835..debe9119b724 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;