From 1d92ed090a91d2b9200c1fe8fb7689ce2fbdd6ef Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Thu, 21 Jun 2012 16:51:25 +0200
Subject: [PATCH] --- yaml --- r: 331525 b: refs/heads/master c:
 f6fec00a9202987f1be2ae0a722518b742a9a799 h: refs/heads/master i:   331523:
 72ed3dfcb5bac35d3094da5682dc904a433a6cc8 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/iommu/amd_iommu_init.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ae8328af7e3c..1c5d2e4adefe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33f28c59e18d83fd2aeef258d211be66b9b80eb3
+refs/heads/master: f6fec00a9202987f1be2ae0a722518b742a9a799
diff --git a/trunk/drivers/iommu/amd_iommu_init.c b/trunk/drivers/iommu/amd_iommu_init.c
index 8a7f1971d633..68b3305a126a 100644
--- a/trunk/drivers/iommu/amd_iommu_init.c
+++ b/trunk/drivers/iommu/amd_iommu_init.c
@@ -1021,6 +1021,13 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h)
 	ret = init_iommu_from_acpi(iommu, h);
 	if (ret)
 		return ret;
+
+	/*
+	 * Make sure IOMMU is not considered to translate itself. The IVRS
+	 * table tells us so, but this is a lie!
+	 */
+	amd_iommu_rlookup_table[iommu->devid] = NULL;
+
 	init_iommu_devices(iommu);
 
 	return 0;