summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2007-11-26 20:42:19 +0100
committerIngo Molnar <mingo@elte.hu>2007-11-26 20:42:19 +0100
commitbc84cf17b50ca5b49bec0a5fef63c58c1526d46b (patch)
tree3f6db3fea4bbc4e06c5e2f5b0d47e3c3b0704103 /arch
parentaafab10d3f6b68150ec9fe75b1462764fd45b728 (diff)
downloadop-kernel-dev-bc84cf17b50ca5b49bec0a5fef63c58c1526d46b.zip
op-kernel-dev-bc84cf17b50ca5b49bec0a5fef63c58c1526d46b.tar.gz
x86: turn off iommu merge by default
revert this commit for now: commit 948062683004d13ca21c8c05ac052d387978a449 Author: Andi Kleen <ak@suse.de> Date: Fri Oct 19 20:35:03 2007 +0200 x86: enable iommu_merge by default it's causing regressions: http://bugzilla.kernel.org/show_bug.cgi?id=9412 Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/pci-dma_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c
index aa805b1..5552d23 100644
--- a/arch/x86/kernel/pci-dma_64.c
+++ b/arch/x86/kernel/pci-dma_64.c
@@ -12,7 +12,7 @@
#include <asm/gart.h>
#include <asm/calgary.h>
-int iommu_merge __read_mostly = 1;
+int iommu_merge __read_mostly = 0;
EXPORT_SYMBOL(iommu_merge);
dma_addr_t bad_dma_address __read_mostly;
OpenPOWER on IntegriCloud