Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d35e5093 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu/arm-smmu: Pass the correct size to be unmapped"

parents 417d4cf8 a52c5abd

drivers/iommu/io-pgtable-arm.c

+2 −1
Original line number Diff line number Diff line
@@ -711,7 +711,8 @@ static size_t arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova, 
		remaining = (size - unmapped);

		size_to_unmap = remaining < SZ_2M

			? remaining

			: iommu_pgsize(data->iop.cfg.pgsize_bitmap, iova, size);

			: iommu_pgsize(data->iop.cfg.pgsize_bitmap, iova,

								remaining);

		ret = __arm_lpae_unmap(data, iova, size_to_unmap, lvl, ptep,

				       NULL);

		if (ret == 0)