diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 09:41:41 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 09:41:41 -0600 |
| commit | cc8a44c671fd3a2c792e9e1f59ea1df52697cc8b (patch) | |
| tree | 9521e782447bb95bb04772aeb274d5387e4cdda1 /include/linux | |
| parent | 4dacb91c7d1ab30aa9aac0d55216fc177d454254 (diff) | |
| parent | 9b936c960f22954bfb89f2fefd8f96916bb42908 (diff) | |
Merge tag 'vfio-v3.17-rc1' of git://github.com/awilliam/linux-vfio
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
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/vfio.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/vfio.h b/include/linux/vfio.h index 25a0fbd4b99..d3204115f15 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -98,16 +98,16 @@ extern int vfio_external_user_iommu_id(struct vfio_group *group); extern long vfio_external_check_extension(struct vfio_group *group, unsigned long arg); +struct pci_dev; #ifdef CONFIG_EEH -extern int vfio_spapr_pci_eeh_open(struct pci_dev *pdev); +extern void vfio_spapr_pci_eeh_open(struct pci_dev *pdev); extern void vfio_spapr_pci_eeh_release(struct pci_dev *pdev); extern long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, unsigned int cmd, unsigned long arg); #else -static inline int vfio_spapr_pci_eeh_open(struct pci_dev *pdev) +static inline void vfio_spapr_pci_eeh_open(struct pci_dev *pdev) { - return 0; } static inline void vfio_spapr_pci_eeh_release(struct pci_dev *pdev) |