summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-04-09 20:18:07 +0400
committerIngo Molnar <mingo@elte.hu>2008-04-19 21:19:58 +0400
commitaa99b16faadcc9a5b6bd9550fda117a8e9e46d26 (patch)
tree744cfe3acc23b134189aff31f1a6a2d4719a8cf7 /arch/x86
parent8f19ca1341a6d89bd96e2e69e6e10f46d3258089 (diff)
downloadlinux-aa99b16faadcc9a5b6bd9550fda117a8e9e46d26.tar.xz
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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/pci-dma_64.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c
index b956f5945d67..596c8c88f36d 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