diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-25 09:47:26 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-25 09:47:26 -0700 |
commit | 48dd7cefa010b704eb2532a2883798fd6d703a0e (patch) | |
tree | b225984502abd725a292122d1209e716894fafe4 /drivers/vfio/vfio_iommu_spapr_tce.c | |
parent | b462b37b08be1b6a4e380d78b978ec1ff84e2783 (diff) | |
parent | f70552809419cd2abc0cc6469a07c9792a3aaa6c (diff) | |
download | linux-48dd7cefa010b704eb2532a2883798fd6d703a0e.tar.gz linux-48dd7cefa010b704eb2532a2883798fd6d703a0e.tar.bz2 linux-48dd7cefa010b704eb2532a2883798fd6d703a0e.zip |
Merge tag 'vfio-v4.7-rc1' of git://github.com/awilliam/linux-vfio
Pull VFIO updates from Alex Williamson:
- Hide INTx on certain known broken devices (Alex Williamson)
- Additional backdoor reset detection (Alex Williamson)
- Remove unused iommudata reference (Alexey Kardashevskiy)
- Use cfg_size to avoid probing extended config space (Alexey
Kardashevskiy)
* tag 'vfio-v4.7-rc1' of git://github.com/awilliam/linux-vfio:
vfio_pci: Test for extended capabilities if config space > 256 bytes
vfio_iommu_spapr_tce: Remove unneeded iommu_group_get_iommudata
vfio/pci: Add test for BAR restore
vfio/pci: Hide broken INTx support from user
Diffstat (limited to 'drivers/vfio/vfio_iommu_spapr_tce.c')
-rw-r--r-- | drivers/vfio/vfio_iommu_spapr_tce.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c index 3054e3fa63ac..80378ddadc5c 100644 --- a/drivers/vfio/vfio_iommu_spapr_tce.c +++ b/drivers/vfio/vfio_iommu_spapr_tce.c @@ -331,14 +331,12 @@ static void tce_iommu_free_table(struct iommu_table *tbl); static void tce_iommu_release(void *iommu_data) { struct tce_container *container = iommu_data; - struct iommu_table_group *table_group; struct tce_iommu_group *tcegrp; long i; while (tce_groups_attached(container)) { tcegrp = list_first_entry(&container->group_list, struct tce_iommu_group, next); - table_group = iommu_group_get_iommudata(tcegrp->grp); tce_iommu_detach_group(iommu_data, tcegrp->grp); } |