1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 2fb2963df553..7a2953d8f12e 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -168,13 +168,13 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova,
 
         BUG_ON(!IS_ALIGNED(iova | paddr, size));
 
-        return domain->ops->map(domain, iova, paddr, gfp_order, prot);
+        return domain->ops->map(domain, iova, paddr, size, prot);
 }
 EXPORT_SYMBOL_GPL(iommu_map);
 
 int iommu_unmap(struct iommu_domain *domain, unsigned long iova, int gfp_order)
 {
-        size_t size;
+        size_t size, unmapped;
 
         if (unlikely(domain->ops->unmap == NULL))
                 return -ENODEV;
@@ -183,6 +183,8 @@ int iommu_unmap(struct iommu_domain *domain, unsigned long iova, int gfp_order)
 
         BUG_ON(!IS_ALIGNED(iova, size));
 
-        return domain->ops->unmap(domain, iova, gfp_order);
+        unmapped = domain->ops->unmap(domain, iova, size);
+
+        return get_order(unmapped);
 }
 EXPORT_SYMBOL_GPL(iommu_unmap);