diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-08-15 22:59:01 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-08-15 22:59:01 +0300 |
| commit | 5fc054a54476f9e2b3d6cc3eeb1537aa549d0ba3 (patch) | |
| tree | 6a0592aa4088435230163ada694c68b839674d60 /include/linux/pci.h | |
| parent | c689209be23166b340c224df8ecd5deea163da56 (diff) | |
| parent | 783e84961b1d7a75045383586b8c49e02b7704cd (diff) | |
| download | linux-5fc054a54476f9e2b3d6cc3eeb1537aa549d0ba3.tar.xz | |
Merge branch 'pci/resource'
- Clean up devm_of_pci_get_host_bridge_resources() resource allocation
(Jan Kiszka)
- Fixup resizable BARs after suspend/resume (Christian König)
- Make "pci=earlydump" generic (Sinan Kaya)
- Fix ROM BAR access routines to stay in bounds and check for signature
correctly (Rex Zhu)
* pci/resource:
PCI: Make pci_get_rom_size() static
PCI: Add check code for last image indicator not set
PCI: Avoid accessing memory outside the ROM BAR
PCI: Make early dump functionality generic
PCI: Cleanup PCI_REBAR_CTRL_BAR_SHIFT handling
PCI: Restore resized BAR state on resume
PCI: Clean up resource allocation in devm_of_pci_get_host_bridge_resources()
# Conflicts:
# Documentation/admin-guide/kernel-parameters.txt
Diffstat (limited to 'include/linux/pci.h')
| -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 3dd5b871b895..f80dfdacf9e6 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1138,7 +1138,6 @@ int pci_enable_rom(struct pci_dev *pdev); void pci_disable_rom(struct pci_dev *pdev); void __iomem __must_check *pci_map_rom(struct pci_dev *pdev, size_t *size); void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom); -size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size); void __iomem __must_check *pci_platform_rom(struct pci_dev *pdev, size_t *size); /* Power management related routines */ |