---

yaml --- r: 91036 b: refs/heads/master c: 8779f2f h: refs/heads/master v: v3
git-mirror · Apr 19, 2008 · 42b3758 · 42b3758
1 parent 1d777df
commit 42b3758
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45a07e774950ef479f8996c0e2c5550dd6440453
+refs/heads/master: 8779f2fc3b84ebb6c5181fb13d702e9944c16069
diff --git a/trunk/arch/x86/kernel/pci-dma_32.c b/trunk/arch/x86/kernel/pci-dma_32.c
@@ -82,9 +82,6 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
 	if (dma_alloc_from_coherent_mem(dev, size, dma_handle, &ret))
 		return ret;
 
-	if (dev == NULL || (dev->coherent_dma_mask < 0xffffffff))
-		gfp |= GFP_DMA;
-
 	if (!dev)
 		dev = &fallback_dev;