From 697b651a7308f8d75c44647324816998028221c0 Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Wed, 2 Dec 2009 10:18:30 +0000
Subject: [PATCH] --- yaml --- r: 176893 b: refs/heads/master c:
 44cd613c0e4cd93079ea2a93aa06649d8ca0830a h: refs/heads/master i:   176891:
 3333d30b0473212b5e41e23051e6ac8804864edf v: v3

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

diff --git a/[refs] b/[refs]
index 760154e180a8..5763785cd39b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5595b528b49a702c0428c0762bab60999648254c
+refs/heads/master: 44cd613c0e4cd93079ea2a93aa06649d8ca0830a
diff --git a/trunk/drivers/pci/intel-iommu.c b/trunk/drivers/pci/intel-iommu.c
index 83cabdc118db..e3e84cac0e98 100644
--- a/trunk/drivers/pci/intel-iommu.c
+++ b/trunk/drivers/pci/intel-iommu.c
@@ -3247,6 +3247,9 @@ static int device_notifier(struct notifier_block *nb,
 	struct pci_dev *pdev = to_pci_dev(dev);
 	struct dmar_domain *domain;
 
+	if (iommu_no_mapping(dev))
+		return 0;
+
 	domain = find_domain(pdev);
 	if (!domain)
 		return 0;