x86: turn off iommu merge by default
authorIngo Molnar <mingo@elte.hu>
Mon, 26 Nov 2007 19:42:19 +0000 (20:42 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 26 Nov 2007 19:42:19 +0000 (20:42 +0100)
commitbc84cf17b50ca5b49bec0a5fef63c58c1526d46b
tree3f6db3fea4bbc4e06c5e2f5b0d47e3c3b0704103
parentaafab10d3f6b68150ec9fe75b1462764fd45b728
x86: turn off iommu merge by default

revert this commit for now:

    commit 948062683004d13ca21c8c05ac052d387978a449
    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>
arch/x86/kernel/pci-dma_64.c