diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2022-05-19 23:10:42 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-05-19 23:10:42 +1000 |
| commit | b104e41cda1ef9c5e851a7de3f30b53535e7d528 (patch) | |
| tree | 7bab688d125e67e42d387b97c45522c76155bbe2 /arch/powerpc/kernel/iommu.c | |
| parent | Merge branch 'fixes' into next (diff) | |
| parent | KVM: PPC: Book3S HV: Fix vcore_blocked tracepoint (diff) | |
| download | wireguard-linux-b104e41cda1ef9c5e851a7de3f30b53535e7d528.tar.xz wireguard-linux-b104e41cda1ef9c5e851a7de3f30b53535e7d528.zip | |
Merge branch 'topic/ppc-kvm' into next
Merge our KVM topic branch.
Diffstat (limited to 'arch/powerpc/kernel/iommu.c')
| -rw-r--r-- | arch/powerpc/kernel/iommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c index d440a2436feb..7e56ddb3e0b9 100644 --- a/arch/powerpc/kernel/iommu.c +++ b/arch/powerpc/kernel/iommu.c @@ -1064,7 +1064,7 @@ extern long iommu_tce_xchg_no_kill(struct mm_struct *mm, long ret; unsigned long size = 0; - ret = tbl->it_ops->xchg_no_kill(tbl, entry, hpa, direction, false); + ret = tbl->it_ops->xchg_no_kill(tbl, entry, hpa, direction); if (!ret && ((*direction == DMA_FROM_DEVICE) || (*direction == DMA_BIDIRECTIONAL)) && !mm_iommu_is_devmem(mm, *hpa, tbl->it_page_shift, @@ -1079,7 +1079,7 @@ void iommu_tce_kill(struct iommu_table *tbl, unsigned long entry, unsigned long pages) { if (tbl->it_ops->tce_kill) - tbl->it_ops->tce_kill(tbl, entry, pages, false); + tbl->it_ops->tce_kill(tbl, entry, pages); } EXPORT_SYMBOL_GPL(iommu_tce_kill); |