diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-12-16 00:11:08 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-12-16 00:11:08 +0300 |
| commit | 6db645f99cc5357ab5520982b85396487c113dc9 (patch) | |
| tree | 0431721fd4cc7b3814371aa734c0b6cfa439be36 /include | |
| parent | 1a76dceaf4268f904292ca126d1cb9af091fd516 (diff) | |
| parent | 0aec75a5963e8d72c59a42055c5b5c524893b910 (diff) | |
| download | linux-6db645f99cc5357ab5520982b85396487c113dc9.tar.xz | |
Merge branch 'pci/misc'
- Update kernel-doc to match function prototypes (Mauro Carvalho Chehab)
- Bounds-check "pci=resource_alignment=" requests (Bjorn Helgaas)
- Fix integer overflow in "pci=resource_alignment=" requests (Colin Ian
King)
- Remove unused HAVE_PCI_SET_MWI definition (Heiner Kallweit)
- Reduce pci_set_cacheline_size() message to debug level (Heiner Kallweit)
* pci/misc:
PCI: Reduce pci_set_cacheline_size() message to debug level
PCI: Remove unused HAVE_PCI_SET_MWI
PCI: Fix overflow in command-line resource alignment requests
PCI: Bounds-check command-line resource alignment requests
PCI: Fix kernel-doc markup
# Conflicts:
# drivers/pci/pci-driver.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 03277148f421..1630a2eb1491 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1197,7 +1197,6 @@ void pci_clear_master(struct pci_dev *dev); int pci_set_pcie_reset_state(struct pci_dev *dev, enum pcie_reset_state state); int pci_set_cacheline_size(struct pci_dev *dev); -#define HAVE_PCI_SET_MWI int __must_check pci_set_mwi(struct pci_dev *dev); int __must_check pcim_set_mwi(struct pci_dev *dev); int pci_try_set_mwi(struct pci_dev *dev); |