diff options
| author | Joerg Roedel <jroedel@suse.de> | 2019-08-20 12:09:43 +0300 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-08-20 12:09:43 +0300 |
| commit | fe427e373d9fa300145c1a03d097f12b6a40fb89 (patch) | |
| tree | e3d6fe5357b120265c7e97ad79e2ae0fac197b16 /drivers/iommu/exynos-iommu.c | |
| parent | 086f9efae7e96ac2c829d33ca3d513caa3bbb225 (diff) | |
| parent | 3951c41af4a65ba418e6b1b973d398552bedb84f (diff) | |
| download | linux-fe427e373d9fa300145c1a03d097f12b6a40fb89.tar.xz | |
Merge branch 'for-joerg/batched-unmap' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into core
Diffstat (limited to 'drivers/iommu/exynos-iommu.c')
| -rw-r--r-- | drivers/iommu/exynos-iommu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index 1934c16a5abc..3ea7b3f8ee12 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -1128,7 +1128,8 @@ static void exynos_iommu_tlb_invalidate_entry(struct exynos_iommu_domain *domain } static size_t exynos_iommu_unmap(struct iommu_domain *iommu_domain, - unsigned long l_iova, size_t size) + unsigned long l_iova, size_t size, + struct iommu_iotlb_gather *gather) { struct exynos_iommu_domain *domain = to_exynos_domain(iommu_domain); sysmmu_iova_t iova = (sysmmu_iova_t)l_iova; |