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/virtio-iommu.c | |
| parent | d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1 (diff) | |
| parent | 1554240ff864da9eb99e2233d3faf191c567c47a (diff) | |
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/virtio-iommu.c')
| -rw-r--r-- | drivers/iommu/virtio-iommu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c index 80a740df0737..3ea9d7682999 100644 --- a/drivers/iommu/virtio-iommu.c +++ b/drivers/iommu/virtio-iommu.c @@ -751,7 +751,7 @@ static int viommu_map(struct iommu_domain *domain, unsigned long iova, } static size_t viommu_unmap(struct iommu_domain *domain, unsigned long iova, - size_t size) + size_t size, struct iommu_iotlb_gather *gather) { int ret = 0; size_t unmapped; @@ -797,7 +797,8 @@ static phys_addr_t viommu_iova_to_phys(struct iommu_domain *domain, return paddr; } -static void viommu_iotlb_sync(struct iommu_domain *domain) +static void viommu_iotlb_sync(struct iommu_domain *domain, + struct iommu_iotlb_gather *gather) { struct viommu_domain *vdomain = to_viommu_domain(domain); |