From 5fa8ad644faa114c4190484ac50e15236fc7cdd9 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Sat, 21 Jan 2006 13:13:13 -0800 Subject: [PATCH] Mask off GFP flags before swiotlb_alloc_coherent Mask off GFP flags before swiotlb_alloc_coherent Signed-off-by: Andi Kleen Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- arch/x86_64/kernel/pci-gart.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c index 2e28e855ec3c..b27b0ff1067a 100644 --- 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, -- cgit v1.2.3