diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2019-09-23 16:10:19 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-09-23 16:10:19 -0500 |
| commit | a40c4b379f574cace68c40390e511e0811266c81 (patch) | |
| tree | f5155389acf56c85151324e823033d9b31bcac4a /drivers/pci/Kconfig | |
| parent | b83e445d462a858d51f04fdb3db0cd307bfabd1f (diff) | |
| parent | f73f8a504e27959576a2f4d85182202561e426f2 (diff) | |
| download | linux-stable-a40c4b379f574cace68c40390e511e0811266c81.tar.gz linux-stable-a40c4b379f574cace68c40390e511e0811266c81.tar.bz2 linux-stable-a40c4b379f574cace68c40390e511e0811266c81.zip | |
Merge branch 'remotes/lorenzo/pci/hv'
- Fix Hyper-V use-after-free in pci_dev removal (Dexuan Cui)
- Fix Hyper-V build error in non-sysfs config (Randy Dunlap)
- Reallocate to avoid Hyper-V domain number collisions (Haiyang Zhang)
- Use Hyper-V instance ID bytes 4-5 to reduce domain collisions (Haiyang
Zhang)
* remotes/lorenzo/pci/hv:
PCI: hv: Use bytes 4 and 5 from instance ID as the PCI domain numbers
PCI: hv: Detect and fix Hyper-V PCI domain number collision
PCI: pci-hyperv: Fix build errors on non-SYSFS config
PCI: hv: Avoid use of hv_pci_dev->pci_slot after freeing it
Diffstat (limited to 'drivers/pci/Kconfig')
| -rw-r--r-- | drivers/pci/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index beb3408a0272..232042722261 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -181,7 +181,7 @@ config PCI_LABEL config PCI_HYPERV tristate "Hyper-V PCI Frontend" - depends on X86 && HYPERV && PCI_MSI && PCI_MSI_IRQ_DOMAIN && X86_64 + depends on X86_64 && HYPERV && PCI_MSI && PCI_MSI_IRQ_DOMAIN && SYSFS help The PCI device frontend driver allows the kernel to import arbitrary PCI devices from a PCI backend to support PCI driver domains. |