Pull VFIO updates from Alex Williamson: - enable support for bus reset on device release - fixes for EEH support * tag 'vfio-v3.17-rc1' of git://github.com/awilliam/linux-vfio: drivers/vfio: Enable VFIO if EEH is not supported drivers/vfio: Allow EEH to be built as module drivers/vfio: Fix EEH build error vfio-pci: Attempt bus/slot reset on release vfio-pci: Use mutex around open, release, and remove vfio-pci: Release devices with BusMaster disabled
Showing the changes to include/linux (1 of 6 files). Show all
Unified · Split
| @@ -98,16 +98,16 @@ extern int vfio_external_user_iommu_id(struct vfio_group *group); · 97 unmodified lines | ||
| 98 | 98 | extern long vfio_external_check_extension(struct vfio_group *group, |
| 99 | 99 | unsigned long arg); |
| 100 | 100 | |
| 101 | +struct pci_dev; | |
| 101 | 102 | #ifdef CONFIG_EEH |
| 102 | −extern int vfio_spapr_pci_eeh_open(struct pci_dev *pdev); | |
| 103 | +extern void vfio_spapr_pci_eeh_open(struct pci_dev *pdev); | |
| 103 | 104 | extern void vfio_spapr_pci_eeh_release(struct pci_dev *pdev); |
| 104 | 105 | extern long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, |
| 105 | 106 | unsigned int cmd, |
| 106 | 107 | unsigned long arg); |
| 107 | 108 | #else |
| 108 | −static inline int vfio_spapr_pci_eeh_open(struct pci_dev *pdev) | |
| 109 | +static inline void vfio_spapr_pci_eeh_open(struct pci_dev *pdev) | |
| 109 | 110 | { |
| 110 | − return 0; | |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | static inline void vfio_spapr_pci_eeh_release(struct pci_dev *pdev) |