diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2017-04-20 11:38:33 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2017-04-20 11:38:33 +1000 |
| commit | 644d2d6fef56f981bca008ba0253dc419d2ede39 (patch) | |
| tree | 9e9b7bdcf21a63a17a8638332dbba69d24f53684 /drivers | |
| parent | 3762d45aa71d546cc0afa29da2f1cd360c099484 (diff) | |
| parent | e5afdf9dd515a9446c009f44f99f9bc2f91b89a7 (diff) | |
| download | linux-644d2d6fef56f981bca008ba0253dc419d2ede39.tar.bz2 | |
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
This merges in the commits in the topic/ppc-kvm branch of the powerpc
tree to get the changes to arch/powerpc which subsequent patches will
rely on.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
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); } |