Commit bc84cf17 authored by Ingo Molnar's avatar Ingo Molnar

x86: turn off iommu merge by default

revert this commit for now:

    commit 94806268
    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=9412Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent aafab10d
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <asm/gart.h> #include <asm/gart.h>
#include <asm/calgary.h> #include <asm/calgary.h>
int iommu_merge __read_mostly = 1; int iommu_merge __read_mostly = 0;
EXPORT_SYMBOL(iommu_merge); EXPORT_SYMBOL(iommu_merge);
dma_addr_t bad_dma_address __read_mostly; dma_addr_t bad_dma_address __read_mostly;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment