---

yaml --- r: 71689 b: refs/heads/master c: 9480626 h: refs/heads/master i: 71687: a9d58fe v: v3
git-mirror · Oct 19, 2007 · ceceb6c · ceceb6c
1 parent c58e84c
commit ceceb6c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;