diff options
| author | Joerg Roedel <jroedel@suse.de> | 2019-08-30 16:12:10 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-08-30 16:12:10 +0200 |
| commit | 4c008893415385a0941bbb626c666620a4d7ab00 (patch) | |
| tree | 979d6ef8540d1c16369679f354c06580eaadb639 /drivers/iommu/exynos-iommu.c | |
| parent | 1ee9feb2c9f893b893c900d2492c6a01dca680f3 (diff) | |
| parent | dbe8e6a81a2a45dfa210c2c271472db80efaa03f (diff) | |
| download | linux-4c008893415385a0941bbb626c666620a4d7ab00.tar.gz | |
Merge branch 'arm/smmu' into arm/mediatek
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 b0c1e5f9daae..cf5af34cb681 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -1130,7 +1130,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; |