diff options
| author | Joerg Roedel <jroedel@suse.de> | 2015-12-22 11:26:37 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-12-22 11:26:37 +0100 |
| commit | 6d6c7e56a20f879f8d7b5ff34ea067bfc7ea1572 (patch) | |
| tree | 7aacd0192a3fa7dd592961604f6cd5794d8fa651 /drivers/iommu/ipmmu-vmsa.c | |
| parent | Linux 4.4-rc6 (diff) | |
| parent | iommu/io-pgtable-arm: Ensure we free the final level on teardown (diff) | |
| download | linux-6d6c7e56a20f879f8d7b5ff34ea067bfc7ea1572.tar.xz linux-6d6c7e56a20f879f8d7b5ff34ea067bfc7ea1572.zip | |
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/ipmmu-vmsa.c')
| -rw-r--r-- | drivers/iommu/ipmmu-vmsa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c index 8cf605fa9946..5b1166d407c4 100644 --- a/drivers/iommu/ipmmu-vmsa.c +++ b/drivers/iommu/ipmmu-vmsa.c @@ -277,8 +277,8 @@ static void ipmmu_tlb_flush_all(void *cookie) ipmmu_tlb_invalidate(domain); } -static void ipmmu_tlb_add_flush(unsigned long iova, size_t size, bool leaf, - void *cookie) +static void ipmmu_tlb_add_flush(unsigned long iova, size_t size, + size_t granule, bool leaf, void *cookie) { /* The hardware doesn't support selective TLB flush. */ } |