diff options
| author | Will Deacon <will@kernel.org> | 2024-07-12 16:54:34 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2024-07-12 16:54:34 +0100 |
| commit | c2b2e5c50330b29804339df4e7adf70e9f19b793 (patch) | |
| tree | 19f794db4eab30610bdc6603b8bf9978672551cd /include/linux/iommu.h | |
| parent | 710f1071f1619657ff87d0d7c019fbcba1bcd97b (diff) | |
| parent | 228159802bcebd95438b54b0bd7c97798582178b (diff) | |
Merge branch 'iommu/core' into iommu/next
* iommu/core:
docs: iommu: Remove outdated Documentation/userspace-api/iommu.rst
iommufd: Use atomic_long_try_cmpxchg() in incr_user_locked_vm()
iommu/iova: Add missing MODULE_DESCRIPTION() macro
iommu/dma: Prune redundant pgprot arguments
iommu: Make iommu_sva_domain_alloc() static
Diffstat (limited to 'include/linux/iommu.h')
| -rw-r--r-- | include/linux/iommu.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/iommu.h b/include/linux/iommu.h index f943f5583df1..8d9b2d990bf8 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -1527,8 +1527,6 @@ struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct mm_struct *mm); void iommu_sva_unbind_device(struct iommu_sva *handle); u32 iommu_sva_get_pasid(struct iommu_sva *handle); -struct iommu_domain *iommu_sva_domain_alloc(struct device *dev, - struct mm_struct *mm); #else static inline struct iommu_sva * iommu_sva_bind_device(struct device *dev, struct mm_struct *mm) @@ -1553,12 +1551,6 @@ static inline u32 mm_get_enqcmd_pasid(struct mm_struct *mm) } static inline void mm_pasid_drop(struct mm_struct *mm) {} - -static inline struct iommu_domain * -iommu_sva_domain_alloc(struct device *dev, struct mm_struct *mm) -{ - return NULL; -} #endif /* CONFIG_IOMMU_SVA */ #ifdef CONFIG_IOMMU_IOPF |