From 0ec1930c6c896a23ee511fa76e03ab9d9b1ea4d8 Mon Sep 17 00:00:00 2001
From: Muli Ben-Yehuda <muli@il.ibm.com>
Date: Wed, 2 Aug 2006 22:37:31 +0200
Subject: [PATCH] --- yaml --- r: 33043 b: refs/heads/master c:
 a166222cde740b34d97fe49dca70348197f4534e h: refs/heads/master i:   33041:
 6b065fe4beefe9ff6e58407707215ab5472b5af9   33039:
 a3282fba0b8b8f9a4f5181031eb72c0e20474d4c v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86_64/kernel/pci-nommu.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ea2b6f0ab3b3..11590e9bf793 100644
--- 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
index c4c3cc36ac5b..aad7609d8e92 100644
--- 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;
 }