[PATCH OLK-6.6 12/31] fix d86d9f910d53 ,change iommu_pgsize's para

Signed-off-by: jiaqingtong jiaqingtong@huawei.com --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 2c2726a53b9f..8785b37c78c7 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2820,7 +2820,7 @@ static int __arm_smmu_merge_page(struct iommu_domain *domain, }

while (size) { - size_t pgsize = iommu_pgsize(domain, iova | paddr, size); + size_t pgsize = iommu_pgsize(domain, iova, paddr, size, NULL);

handled_size = ops->merge_page(ops, iova, paddr, pgsize, prot); if (handled_size != pgsize) {