x86: unify gfp masks

[deliverable/linux.git] / arch / x86 / kernel / pci-dma_64.c

diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c
index 13a31a4a4c17959ccdaee8f75f671690a11f3f0d..b956f5945d67b62e47c54aba646483cbeae37cbb 100644 (file)
--- a/arch/x86/kernel/pci-dma_64.c
+++ b/arch/x86/kernel/pci-dma_64.c
@@ -49,6 +49,8 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
        unsigned long dma_mask = 0;
        u64 bus;
 
+       /* ignore region specifiers */
+       gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
 
        if (dma_alloc_from_coherent_mem(dev, size, dma_handle, &memory))
                return memory;