[PATCH] Mask off GFP flags before swiotlb_alloc_coherent

Mask off GFP flags before swiotlb_alloc_coherent

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Chris Wright <chris@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c
index 2e28e855ec3cff500847957a51251368407fbea3..b27b0ff1067a7cbc1e34de83f489407bd72dcab8 100644 (file)
--- a/arch/x86_64/kernel/pci-gart.c
+++ b/arch/x86_64/kernel/pci-gart.c
@@ -244,6 +244,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
                                           get_order(size));
 
                                if (swiotlb) {
+                                       gfp &= ~(GFP_DMA32|GFP_DMA);
                                        return
                                        swiotlb_alloc_coherent(dev, size,
                                                               dma_handle,