From 0e9dbf1a72b450b209f0868a48f29a101fa9a26f Mon Sep 17 00:00:00 2001
From: Mike Travis <travis@sgi.com>
Date: Sat, 28 May 2011 13:15:03 -0500
Subject: [PATCH] --- yaml --- r: 252966 b: refs/heads/master c:
 cb452a4040bb051d92e85d6e7eb60c11734c1781 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2c47f6cd231e..dad2e1949232 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fcc5372fbac085199d84a880503ed67aba3fe49
+refs/heads/master: cb452a4040bb051d92e85d6e7eb60c11734c1781
diff --git a/trunk/drivers/pci/intel-iommu.c b/trunk/drivers/pci/intel-iommu.c
index dcf051d53b74..98be0b55ac0b 100644
--- a/trunk/drivers/pci/intel-iommu.c
+++ b/trunk/drivers/pci/intel-iommu.c
@@ -2235,10 +2235,10 @@ static int identity_mapping(struct pci_dev *pdev)
 	if (likely(!iommu_identity_mapping))
 		return 0;
 
+	info = pdev->dev.archdata.iommu;
+	if (info && info != DUMMY_DEVICE_DOMAIN_INFO)
+		return (info->domain == si_domain);
 
-	list_for_each_entry(info, &si_domain->devices, link)
-		if (info->dev == pdev)
-			return 1;
 	return 0;
 }