diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2017-04-28 20:19:37 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-04-28 20:19:37 +1000 |
| commit | b13f6683ed4f42b2b4bed86ca2dec4ba478af47c (patch) | |
| tree | 1cd23bb222a80f4b7e495062f5100367c9317072 /drivers | |
| parent | powerpc/ftrace/64: Split further based on -mprofile-kernel (diff) | |
| parent | powerpc/vfio_spapr_tce: Add reference counting to iommu_table (diff) | |
| download | linux-dev-b13f6683ed4f42b2b4bed86ca2dec4ba478af47c.tar.xz linux-dev-b13f6683ed4f42b2b4bed86ca2dec4ba478af47c.zip | |
Merge branch 'topic/ppc-kvm' into next
Merge the topic branch we were sharing with kvm-ppc, Paul has also
merged it.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/vfio/vfio_iommu_spapr_tce.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c index cf3de91fbfe7..8031d3a55a17 100644 --- a/drivers/vfio/vfio_iommu_spapr_tce.c +++ b/drivers/vfio/vfio_iommu_spapr_tce.c @@ -680,7 +680,7 @@ static void tce_iommu_free_table(struct tce_container *container, unsigned long pages = tbl->it_allocated_size >> PAGE_SHIFT; tce_iommu_userspace_view_free(tbl, container->mm); - tbl->it_ops->free(tbl); + iommu_tce_table_put(tbl); decrement_locked_vm(container->mm, pages); } |