From: Andi Kleen <ak@suse.de>
Date: Fri, 3 Feb 2006 20:50:59 +0000 (+0100)
Subject: [PATCH] x86_64: Fix swiotlb dma_alloc_coherent fallback
X-Git-Tag: v2.6.16-rc3~196
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6bca52b544489b626c7d0db801df6b4aa3d5adb5;p=linux-2.6-omap-h63xx.git

[PATCH] x86_64: Fix swiotlb dma_alloc_coherent fallback

This avoids BUG_ONs in the low level allocator when an illegal
GFP mask is added.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/x86_64/kernel/pci-dma.c b/arch/x86_64/kernel/pci-dma.c
index 2f5d8328e2b..4ed391edd47 100644
--- a/arch/x86_64/kernel/pci-dma.c
+++ b/arch/x86_64/kernel/pci-dma.c
@@ -107,6 +107,9 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
 				goto again;
 			}
 
+			/* Let low level make its own zone decisions */
+			gfp &= ~(GFP_DMA32|GFP_DMA);
+
 			if (dma_ops->alloc_coherent)
 				return dma_ops->alloc_coherent(dev, size,
 							   dma_handle, gfp);