summaryrefslogtreecommitdiff
path: root/drivers/iommu/amd_iommu.c
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2014-11-21 12:28:28 +0100
committerJoerg Roedel <jroedel@suse.de>2014-11-21 12:28:28 +0100
commit2d565a57f2520b6bc2de0eef1d77d9683f397947 (patch)
tree46654119e86a98c36adc93eed9c0bed2e417d0b8 /drivers/iommu/amd_iommu.c
parentfc14f9c1272f62c3e8d01300f52467c0d9af50f9 (diff)
parentc752ce45b213de8532baaf987ba930638f77c439 (diff)
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Diffstat (limited to 'drivers/iommu/amd_iommu.c')
-rw-r--r--drivers/iommu/amd_iommu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 505a9adac2d5..3d78a8fb5a6a 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -3411,6 +3411,8 @@ static bool amd_iommu_capable(enum iommu_cap cap)
return true;
case IOMMU_CAP_INTR_REMAP:
return (irq_remapping_enabled == 1);
+ case IOMMU_CAP_NOEXEC:
+ return false;
}
return false;