From: Andi Kleen <ak@suse.de>
Date: Fri, 19 Oct 2007 18:35:03 +0000 (+0200)
Subject: x86: enable iommu_merge by default
X-Git-Tag: v2.6.24-rc1~132^2~15
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=948062683004d13ca21c8c05ac052d387978a449;p=linux-2.6-omap-h63xx.git

x86: enable iommu_merge by default

[ tglx: arch/x86 adaptation ]

Signed-off-by: Andi Kleen <ak@suse.de>
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 b2b42bdb0a1..afaf9f12c03 100644
--- a/arch/x86/kernel/pci-dma_64.c
+++ b/arch/x86/kernel/pci-dma_64.c
@@ -11,7 +11,7 @@
 #include <asm/iommu.h>
 #include <asm/calgary.h>
 
-int iommu_merge __read_mostly = 0;
+int iommu_merge __read_mostly = 1;
 EXPORT_SYMBOL(iommu_merge);
 
 dma_addr_t bad_dma_address __read_mostly;