Commit 94806268 authored Oct 19, 2007 by Andi Kleen Committed by Thomas Gleixner Oct 19, 2007

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>

parent 4f8a6b1a

arch/x86/kernel/pci-dma_64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;