From 98286a95ac5b60d10d45260c1afcb085e33b3318 Mon Sep 17 00:00:00 2001
From: Weidong Han <weidong.han@intel.com>
Date: Mon, 8 Dec 2008 11:24:12 +0800
Subject: [PATCH] --- yaml --- r: 125571 b: refs/heads/master c:
 a2bb8459fe46e5aaad6637b31b5593d740097cba h: refs/heads/master i:   125569:
 6ed035ea2c8c8c22bfb5d59b76fd1cc893852e9f   125567:
 01a407c11eefd5f691d84cdce6780a96a959736e v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/pci/intel-iommu.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index dabdfe0a6206..e2fd09dc246c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9630fe941769dd050fbc38fbbac20a708ab9461
+refs/heads/master: a2bb8459fe46e5aaad6637b31b5593d740097cba
diff --git a/trunk/drivers/pci/intel-iommu.c b/trunk/drivers/pci/intel-iommu.c
index d2ffa7a6d723..86b9f58a645e 100644
--- a/trunk/drivers/pci/intel-iommu.c
+++ b/trunk/drivers/pci/intel-iommu.c
@@ -2101,10 +2101,11 @@ static void flush_unmaps(void)
 
 	/* just flush them all */
 	for (i = 0; i < g_num_of_iommus; i++) {
-		if (deferred_flush[i].next) {
-			struct intel_iommu *iommu =
-				deferred_flush[i].domain[0]->iommu;
+		struct intel_iommu *iommu = g_iommus[i];
+		if (!iommu)
+			continue;
 
+		if (deferred_flush[i].next) {
 			iommu->flush.flush_iotlb(iommu, 0, 0, 0,
 						 DMA_TLB_GLOBAL_FLUSH, 0);
 			for (j = 0; j < deferred_flush[i].next; j++) {