iommu: Correct iommu_map / iommu_unmap prototypes

PATCH Applied Dmitry Osipenko 2 participants 2 messages Jul 5, 2017 – Jul 26, 2017 IOMMU

Share & tools

Dmitry Osipenko

author

2017-07-05 17:27 UTC #0 lore raw

PATCH 1/1 iommu: Correct iommu_map / iommu_unmap prototypes

Commit 7d3002cc8c16 ("iommu/core: split mapping to page sizes as supported by the hardware") replaced 'int gfp_order' with a 'size_t size' of iommu_map / iommu_unmap function arguments, but missed the function prototypes for the disabled CONFIG_IOMMU_API case, let's correct them for consistency.

Signed-off-by Dmitry Osipenko <[email protected]>

---
 include/linux/iommu.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

include/linux/iommu.h +2 -2

index 2cb54adc4a33..f1ce8e517d8d 100644
@@ -425,13 +425,13 @@ static inline struct iommu_domain *iommu_get_domain_for_dev(struct device *dev)
 }
 
 static inline int iommu_map(struct iommu_domain *domain, unsigned long iova,
-			    phys_addr_t paddr, int gfp_order, int prot)
+			    phys_addr_t paddr, size_t size, int prot)
 {
 	return -ENODEV;
 }
 
 static inline int iommu_unmap(struct iommu_domain *domain, unsigned long iova,
-			      int gfp_order)
+			      size_t size)
 {
 	return -ENODEV;
 }

Signature · 1 line

2.13.2

Joerg Roedel

maintainer Applied

2017-07-26 09:27 UTC #1 lore raw

Quoted 10 lines · Dmitry Osipenko

Commit 7d3002cc8c16 ("iommu/core: split mapping to page sizes as supported by the hardware") replaced 'int gfp_order' with a 'size_t size' of iommu_map / iommu_unmap function arguments, but missed the function prototypes for the disabled CONFIG_IOMMU_API case, let's correct them for consistency.
Signed-off-by Dmitry Osipenko <[email protected]>
---
 include/linux/iommu.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.