---

yaml --- r: 91039 b: refs/heads/master c: aa99b16 h: refs/heads/master i: 91037: e5d1c92 91035: 1d777df 91031: 3711481 91023: e156032 91007: dbd86ed v: v3
git-mirror · Apr 19, 2008 · 20c1496 · 20c1496
1 parent 04f5d6f
commit 20c1496
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f19ca1341a6d89bd96e2e69e6e10f46d3258089
+refs/heads/master: aa99b16faadcc9a5b6bd9550fda117a8e9e46d26
diff --git a/trunk/arch/x86/kernel/pci-dma_64.c b/trunk/arch/x86/kernel/pci-dma_64.c
@@ -68,10 +68,6 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
 	/* Don't invoke OOM killer */
 	gfp |= __GFP_NORETRY;
 
-	/* Kludge to make it bug-to-bug compatible with i386. i386
-	   uses the normal dma_mask for alloc_coherent. */
-	dma_mask &= *dev->dma_mask;
-
 	/* Why <=? Even when the mask is smaller than 4GB it is often
 	   larger than 16MB and in this case we have a chance of
 	   finding fitting memory in the next higher zone first. If