From c59ece8514a0c4ae88390a6e4969c1e1cf962cea Mon Sep 17 00:00:00 2001
From: Alex Williamson <alex.williamson@redhat.com>
Date: Tue, 24 May 2011 12:02:41 +0100
Subject: [PATCH] --- yaml --- r: 252962 b: refs/heads/master c:
 7b668357810ecb5fdda4418689d50f5d95aea6a8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3bb35c48078c..3d0757d0dd70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3a530e4e734cab7043a3ab7d135f539042443a7
+refs/heads/master: 7b668357810ecb5fdda4418689d50f5d95aea6a8
diff --git a/trunk/drivers/pci/intel-iommu.c b/trunk/drivers/pci/intel-iommu.c
index 4e4e0202e59d..395f253c0494 100644
--- a/trunk/drivers/pci/intel-iommu.c
+++ b/trunk/drivers/pci/intel-iommu.c
@@ -1422,6 +1422,10 @@ static void domain_exit(struct dmar_domain *domain)
 	if (!domain)
 		return;
 
+	/* Flush any lazy unmaps that may reference this domain */
+	if (!intel_iommu_strict)
+		flush_unmaps_timeout(0);
+
 	domain_remove_dev_info(domain);
 	/* destroy iovas */
 	put_iova_domain(&domain->iovad);