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/s390-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/s390-iommu.c')
-rw-r--r-- | drivers/iommu/s390-iommu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iommu/s390-iommu.c b/drivers/iommu/s390-iommu.c index 22d4db302c1c..3b0b18e23187 100644 --- a/drivers/iommu/s390-iommu.c +++ b/drivers/iommu/s390-iommu.c @@ -314,7 +314,8 @@ static phys_addr_t s390_iommu_iova_to_phys(struct iommu_domain *domain, } static size_t s390_iommu_unmap(struct iommu_domain *domain, - unsigned long iova, size_t size) + unsigned long iova, size_t size, + struct iommu_iotlb_gather *gather) { struct s390_domain *s390_domain = to_s390_domain(domain); int flags = ZPCI_PTE_INVALID; |