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/mtk_iommu_v1.c | |
| parent | 1ee9feb2c9f893b893c900d2492c6a01dca680f3 (diff) | |
| parent | dbe8e6a81a2a45dfa210c2c271472db80efaa03f (diff) | |
| download | linux-4c008893415385a0941bbb626c666620a4d7ab00.tar.bz2 | |
Merge branch 'arm/smmu' into arm/mediatek
Diffstat (limited to 'drivers/iommu/mtk_iommu_v1.c')
| -rw-r--r-- | drivers/iommu/mtk_iommu_v1.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c index 860926c65903..210b1c7c0bda 100644 --- a/drivers/iommu/mtk_iommu_v1.c +++ b/drivers/iommu/mtk_iommu_v1.c @@ -324,7 +324,8 @@ static int mtk_iommu_map(struct iommu_domain *domain, unsigned long iova, } static size_t mtk_iommu_unmap(struct iommu_domain *domain, - unsigned long iova, size_t size) + unsigned long iova, size_t size, + struct iommu_iotlb_gather *gather) { struct mtk_iommu_domain *dom = to_mtk_domain(domain); unsigned long flags; |