diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2012-01-09 13:06:28 +0100 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-01-09 13:06:28 +0100 |
commit | f93ea733878733f3e98475bc3e2ccf789bebcfb8 (patch) | |
tree | ce4981e49a75d5bac7f0d2fa4ddcdcc130cf56f0 /include/linux/iommu.h | |
parent | 00fb5430f547e411ab03385cfa548776aaac1c92 (diff) | |
parent | 95bdaf71ccf2cb4bba0c9a3d2baea0e7916f466b (diff) | |
download | linux-stable-f93ea733878733f3e98475bc3e2ccf789bebcfb8.tar.gz linux-stable-f93ea733878733f3e98475bc3e2ccf789bebcfb8.tar.bz2 linux-stable-f93ea733878733f3e98475bc3e2ccf789bebcfb8.zip |
Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next
Conflicts:
drivers/iommu/amd_iommu.c
drivers/iommu/intel-iommu.c
include/linux/iommu.h
Diffstat (limited to 'include/linux/iommu.h')
-rw-r--r-- | include/linux/iommu.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/iommu.h b/include/linux/iommu.h index cc26f89c4ee6..d937580417ba 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -74,6 +74,7 @@ struct iommu_ops { unsigned long iova); int (*domain_has_cap)(struct iommu_domain *domain, unsigned long cap); + int (*device_group)(struct device *dev, unsigned int *groupid); unsigned long pgsize_bitmap; }; @@ -95,6 +96,7 @@ extern int iommu_domain_has_cap(struct iommu_domain *domain, unsigned long cap); extern void iommu_set_fault_handler(struct iommu_domain *domain, iommu_fault_handler_t handler); +extern int iommu_device_group(struct device *dev, unsigned int *groupid); /** * report_iommu_fault() - report about an IOMMU fault to the IOMMU framework @@ -193,6 +195,11 @@ static inline void iommu_set_fault_handler(struct iommu_domain *domain, { } +static inline int iommu_device_group(struct device *dev, unsigned int *groupid) +{ + return -ENODEV; +} + #endif /* CONFIG_IOMMU_API */ #endif /* __LINUX_IOMMU_H */ |