From 3b02b34a0735d068f16be50ee814354e9e6a9b35 Mon Sep 17 00:00:00 2001
From: Suresh Siddha <suresh.b.siddha@intel.com>
Date: Tue, 30 Nov 2010 22:22:29 -0800
Subject: [PATCH] --- yaml --- r: 223439 b: refs/heads/master c:
 7f99d946e71e71d484b7543b49e990508e70d0c0 h: refs/heads/master i:   223437:
 81840ee48ebfa7f9c6833421c4df2823def4f378   223435:
 20364c53023a624269c6f2b41b1616a52edaa15a   223431:
 08e3480c57d49565008771e41105ce3f7860f505   223423:
 31c8376b6976d6e6af8d4aa01dfaf8fd86502976 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/pci/dmar.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1e647bd1784f..2c9cf2794308 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f7fbf45c6b748074546f7f16b9488ca71de99c1
+refs/heads/master: 7f99d946e71e71d484b7543b49e990508e70d0c0
diff --git a/trunk/drivers/pci/dmar.c b/trunk/drivers/pci/dmar.c
index 0157708d474d..09933eb9126b 100644
--- a/trunk/drivers/pci/dmar.c
+++ b/trunk/drivers/pci/dmar.c
@@ -1417,6 +1417,11 @@ int __init enable_drhd_fault_handling(void)
 			       (unsigned long long)drhd->reg_base_addr, ret);
 			return -1;
 		}
+
+		/*
+		 * Clear any previous faults.
+		 */
+		dmar_fault(iommu->irq, iommu);
 	}
 
 	return 0;