diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-23 11:18:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-23 11:18:43 -0700 |
| commit | 095fe49fd559f0b98e4cb396e235d32909a0eacc (patch) | |
| tree | 681a2935bab9a0e7beff03fd9d1725531b554af9 /drivers | |
| parent | Merge tag 'mtd/fixes-for-4.16-rc7' of git://git.infradead.org/linux-mtd (diff) | |
| parent | Revert: "vfio-pci: Mask INTx if a device is not capabable of enabling it" (diff) | |
| download | linux-dev-095fe49fd559f0b98e4cb396e235d32909a0eacc.tar.xz linux-dev-095fe49fd559f0b98e4cb396e235d32909a0eacc.zip | |
Merge tag 'vfio-v4.16-rc7' of git://github.com/awilliam/linux-vfio
Pull VFIO fix from Alex Williamson:
"Revert masking INTx where it cannot be enabled - it plays poorly with
SR-IOV VFs and presumes DisINTx support"
* tag 'vfio-v4.16-rc7' of git://github.com/awilliam/linux-vfio:
Revert: "vfio-pci: Mask INTx if a device is not capabable of enabling it"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/vfio/pci/vfio_pci.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index b0f759476900..8a1508a8e481 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -207,9 +207,6 @@ static bool vfio_pci_nointx(struct pci_dev *pdev) } } - if (!pdev->irq) - return true; - return false; } |