aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Kleen <ak@muc.de>2006-01-21 13:13:13 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-30 22:13:18 -0800
commit5fa8ad644faa114c4190484ac50e15236fc7cdd9 (patch)
tree32dbcc6ef77e80c77cebfd2d361efaf003b25885
parent4f0ae08d5897f3bd66612d568081392c8dd9eeb1 (diff)
downloadlinux-linaro-stable-5fa8ad644faa114c4190484ac50e15236fc7cdd9.tar.gz
[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>
-rw-r--r--arch/x86_64/kernel/pci-gart.c1
1 files changed, 1 insertions, 0 deletions
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,