Merge branch 'for-joerg/batched-unmap' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into core

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index bdaed2da8a55..d6003b391e2c 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -5150,7 +5150,8 @@ static int intel_iommu_map(struct iommu_domain *domain,
 }
 
 static size_t intel_iommu_unmap(struct iommu_domain *domain,
-                                unsigned long iova, size_t size)
+                                unsigned long iova, size_t size,
+                                struct iommu_iotlb_gather *gather)
 {
         struct dmar_domain *dmar_domain = to_dmar_domain(domain);
         struct page *freelist = NULL;