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>
This commit is contained in:
parent
4f8a6b1ab2
commit
9480626830
|
@ -11,7 +11,7 @@
|
||||||
#include <asm/iommu.h>
|
#include <asm/iommu.h>
|
||||||
#include <asm/calgary.h>
|
#include <asm/calgary.h>
|
||||||
|
|
||||||
int iommu_merge __read_mostly = 0;
|
int iommu_merge __read_mostly = 1;
|
||||||
EXPORT_SYMBOL(iommu_merge);
|
EXPORT_SYMBOL(iommu_merge);
|
||||||
|
|
||||||
dma_addr_t bad_dma_address __read_mostly;
|
dma_addr_t bad_dma_address __read_mostly;
|
||||||
|
|
Loading…
Reference in New Issue