Skip to content

Commit

Permalink
x86: turn off iommu merge by default
Browse files Browse the repository at this point in the history
revert this commit for now:

    commit 9480626
    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=9412

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Ingo Molnar committed Nov 26, 2007
1 parent aafab10 commit bc84cf1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/x86/kernel/pci-dma_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <asm/gart.h>
#include <asm/calgary.h>

int iommu_merge __read_mostly = 1;
int iommu_merge __read_mostly = 0;
EXPORT_SYMBOL(iommu_merge);

dma_addr_t bad_dma_address __read_mostly;
Expand Down

0 comments on commit bc84cf1

Please sign in to comment.