diff options
| author | Joerg Roedel <jroedel@suse.de> | 2019-08-23 17:41:59 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-08-23 17:41:59 +0200 |
| commit | dbe8e6a81a2a45dfa210c2c271472db80efaa03f (patch) | |
| tree | d8c11ee8159d5730fdd419dc0d463b80757bc314 /drivers/iommu/mtk_iommu_v1.c | |
| parent | d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1 (diff) | |
| parent | 1554240ff864da9eb99e2233d3faf191c567c47a (diff) | |
| download | linux-dbe8e6a81a2a45dfa210c2c271472db80efaa03f.tar.gz | |
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
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 abeeac488372..7b92ddd5d9fd 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; |