From: Glauber Costa <gcosta@redhat.com>
Date: Wed, 9 Apr 2008 16:18:07 +0000 (-0300)
Subject: x86: remove kludge from x86_64
X-Git-Tag: v2.6.26-rc1~1133^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=aa99b16faadcc9a5b6bd9550fda117a8e9e46d26;p=linux-2.6-omap-h63xx.git

x86: remove kludge from x86_64

The claim is that i386 does it. Just it does not.
So remove it.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c
index b956f5945d6..596c8c88f36 100644
--- a/arch/x86/kernel/pci-dma_64.c
+++ b/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