diff options
| author |   Andi Kleen <ak@suse.de> | 2007-10-19 20:35:03 +0200 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2007-10-19 20:35:03 +0200 |
| commit | 948062683004d13ca21c8c05ac052d387978a449 (patch) | |
| tree | f32fba9a5c30efde5ecdec8e7cfb9e33c169f645 /arch/x86 | |
| parent | i386: i386 add AMD64 Barcelona PMU MSR definitions to msr.h (diff) | |
| download | linux-dev-948062683004d13ca21c8c05ac052d387978a449.tar.xz linux-dev-948062683004d13ca21c8c05ac052d387978a449.zip | |
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>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/pci-dma_64.c | 2 |
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 b2b42bdb0a15..afaf9f12c032 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; |