summaryrefslogtreecommitdiff
path: root/drivers/base/iommu.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-04-08 19:02:50 +0400
committerIngo Molnar <mingo@elte.hu>2009-04-08 19:02:57 +0400
commitff96e612cba32510e263e17b213235fe5746397e (patch)
treea8df57d76b10e0901a4fb76cd2987eb9826a560a /drivers/base/iommu.c
parentcd84a42f315e50edd454c27a3da3951ccd3d735a (diff)
parent577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff)
downloadlinux-ff96e612cba32510e263e17b213235fe5746397e.tar.xz
Merge commit 'v2.6.30-rc1' into core/urgent
Merge reason: need latest upstream to queue up dependent fix Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/base/iommu.c')
-rw-r--r--drivers/base/iommu.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/base/iommu.c b/drivers/base/iommu.c
index c2d1eed90376..9f0e672f4be8 100644
--- a/drivers/base/iommu.c
+++ b/drivers/base/iommu.c
@@ -98,3 +98,10 @@ phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain,
return iommu_ops->iova_to_phys(domain, iova);
}
EXPORT_SYMBOL_GPL(iommu_iova_to_phys);
+
+int iommu_domain_has_cap(struct iommu_domain *domain,
+ unsigned long cap)
+{
+ return iommu_ops->domain_has_cap(domain, cap);
+}
+EXPORT_SYMBOL_GPL(iommu_domain_has_cap);