From ceceb6ccd127f610c84ce10dace0352dd8d8b6a3 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Fri, 19 Oct 2007 20:35:03 +0200
Subject: [PATCH] --- yaml --- r: 71689 b: refs/heads/master c:
 948062683004d13ca21c8c05ac052d387978a449 h: refs/heads/master i:   71687:
 a9d58fe12b8afc57ae0bc7669a043b38711f1c64 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/pci-dma_64.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6f9666af1798..803a1293af7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f8a6b1ab222d08931a36d6770a60cff405968bd
+refs/heads/master: 948062683004d13ca21c8c05ac052d387978a449
diff --git a/trunk/arch/x86/kernel/pci-dma_64.c b/trunk/arch/x86/kernel/pci-dma_64.c
index b2b42bdb0a15..afaf9f12c032 100644
--- a/trunk/arch/x86/kernel/pci-dma_64.c
+++ b/trunk/arch/x86/kernel/pci-dma_64.c
@@ -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;