---

yaml --- r: 33043 b: refs/heads/master c: a166222 h: refs/heads/master i: 33041: 6b065fe 33039: a3282fb v: v3
git-mirror · Aug 3, 2006 · 0ec1930 · 0ec1930
1 parent 857e3d8
commit 0ec1930
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2699500b31f41fc25656c42548c8a388c8a329fe
+refs/heads/master: a166222cde740b34d97fe49dca70348197f4534e
diff --git a/trunk/arch/x86_64/kernel/pci-nommu.c b/trunk/arch/x86_64/kernel/pci-nommu.c
@@ -92,5 +92,7 @@ void __init no_iommu_init(void)
 {
 	if (dma_ops)
 		return;
+
+	force_iommu = 0; /* no HW IOMMU */
 	dma_ops = &nommu_dma_ops;
 }