diff options
| author | Andi Kleen <ak@suse.de> | 2006-02-03 21:50:59 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-05 01:43:13 +0100 |
| commit | 6bca52b544489b626c7d0db801df6b4aa3d5adb5 (patch) | |
| tree | 6011b1cec5ffae37ed499013908e38cbdeaf651b /arch/x86_64/kernel/pci-dma.c | |
| parent | [PATCH] x86_64: [PATCH] timer resume (diff) | |
| download | linux-6bca52b544489b626c7d0db801df6b4aa3d5adb5.tar.xz linux-6bca52b544489b626c7d0db801df6b4aa3d5adb5.zip | |
[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>
Diffstat (limited to 'arch/x86_64/kernel/pci-dma.c')
| -rw-r--r-- | arch/x86_64/kernel/pci-dma.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/pci-dma.c b/arch/x86_64/kernel/pci-dma.c index 2f5d8328e2b9..4ed391edd47a 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); |