From 4f0a70ce33b7c3cfb6845dc3f58190aa1672f473 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Mon, 2 Jul 2012 18:38:13 +0200
Subject: [PATCH] --- yaml --- r: 331535 b: refs/heads/master c:
 bdddadcb0783b965f524b6f43c475390f5f76765 h: refs/heads/master i:   331533:
 bc96cff63fdba3e853ffcf9296d65eb14f38cb11   331531:
 af1c4712d0d4f852788a8902459fa41bb79b067b   331527:
 9fcc09f5392125db4099d9f502e13874b3f9c8c4   331519:
 37a487763bbd5bb8d0efc5b187ceca33ecae96c7 v: v3

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

diff --git a/[refs] b/[refs]
index 657b04028fcc..aec9eeb4ef80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebe60bbfdc3914bfb833595f36444a2f76a3cc0c
+refs/heads/master: bdddadcb0783b965f524b6f43c475390f5f76765
diff --git a/trunk/drivers/iommu/amd_iommu.c b/trunk/drivers/iommu/amd_iommu.c
index 33f144f7d676..312dd4dd4791 100644
--- a/trunk/drivers/iommu/amd_iommu.c
+++ b/trunk/drivers/iommu/amd_iommu.c
@@ -3353,6 +3353,8 @@ static int amd_iommu_domain_has_cap(struct iommu_domain *domain,
 	switch (cap) {
 	case IOMMU_CAP_CACHE_COHERENCY:
 		return 1;
+	case IOMMU_CAP_INTR_REMAP:
+		return irq_remapping_enabled;
 	}
 
 	return 0;