diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-25 02:42:31 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-25 02:42:31 +0100 |
| commit | 2d08cd0ef89a24f5eb6c6801c48cd06bca230d6d (patch) | |
| tree | d9bbec83fa54dd5338144089b6dcb570a40237e7 /drivers/vfio/pci/vfio_pci.c | |
| parent | Merge tag 'md/3.14' of git://neil.brown.name/md (diff) | |
| parent | vfio-pci: Don't use device_lock around AER interrupt setup (diff) | |
| download | linux-2d08cd0ef89a24f5eb6c6801c48cd06bca230d6d.tar.xz linux-2d08cd0ef89a24f5eb6c6801c48cd06bca230d6d.zip | |
Merge tag 'vfio-v3.14-rc1' of git://github.com/awilliam/linux-vfio
Pull vfio update from Alex Williamson:
- convert to misc driver to support module auto loading
- remove unnecessary and dangerous use of device_lock
* tag 'vfio-v3.14-rc1' of git://github.com/awilliam/linux-vfio:
vfio-pci: Don't use device_lock around AER interrupt setup
vfio: Convert control interface to misc driver
misc: Reserve minor for VFIO
Diffstat (limited to 'drivers/vfio/pci/vfio_pci.c')
| -rw-r--r-- | drivers/vfio/pci/vfio_pci.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index 2319d206f630..7ba042498857 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -872,9 +872,13 @@ static pci_ers_result_t vfio_pci_aer_err_detected(struct pci_dev *pdev, return PCI_ERS_RESULT_DISCONNECT; } + mutex_lock(&vdev->igate); + if (vdev->err_trigger) eventfd_signal(vdev->err_trigger, 1); + mutex_unlock(&vdev->igate); + vfio_device_put(device); return PCI_ERS_RESULT_CAN_RECOVER; |