summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 09:22:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 09:22:39 -0700
commitcc77b4db0017dab014ad7ea3d297e10f5b5bf028 (patch)
tree31d022e12b81d4870b00a766ba8ae085bb34f382 /drivers
parent132a4edb2b69924742f62dc06ace42ad2a9f57f3 (diff)
parent7a42c4ff02d1bd764804a4ba36c2b839070c5e7d (diff)
downloadlinux-cc77b4db0017dab014ad7ea3d297e10f5b5bf028.tar.bz2
Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86/amd-iommu: Export cache-coherency capability iommu-api: Extension to check for interrupt remapping x86/amd-iommu: Use for_each_pci_dev()
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/intel-iommu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index c9171be74564..6a5af18faf68 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -3698,6 +3698,8 @@ static int intel_iommu_domain_has_cap(struct iommu_domain *domain,
if (cap == IOMMU_CAP_CACHE_COHERENCY)
return dmar_domain->iommu_snooping;
+ if (cap == IOMMU_CAP_INTR_REMAP)
+ return intr_remapping_enabled;
return 0;
}