---

yaml --- r: 19767 b: refs/heads/master c: 6bca52b h: refs/heads/master i: 19765: b9e74c7 19763: fa580e9 19759: 10472f0 v: v3
git-mirror · Feb 5, 2006 · 59a3d33 · 59a3d33
1 parent 6d785fb
commit 59a3d33
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dd2ea9af8f0eca43cf6200baa182b3aba307049
+refs/heads/master: 6bca52b544489b626c7d0db801df6b4aa3d5adb5
diff --git a/trunk/arch/x86_64/kernel/pci-dma.c b/trunk/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);