From 7d7611e4fb7fb981f792bb1704e13e7a99cbf411 Mon Sep 17 00:00:00 2001 From: Kelsey Skunberg Date: Wed, 21 Jul 2021 10:29:27 +0800 Subject: [PATCH 2939/2944] PCI: Make pci_hotplug_io_size, mem_size, and bus_size private fix #34916049 commit 003d3b2c5f835d897b3b10a13a9e1340630e93f1 upstream These symbols: extern unsigned long pci_hotplug_io_size; extern unsigned long pci_hotplug_mem_size; extern unsigned long pci_hotplug_bus_size; are only used in drivers/pci/ and do not need to be seen by the rest of the kernel. Move them to drivers/pci/pci.h so they're private to the PCI subsystem. Link: https://lore.kernel.org/r/20190724233848.73327-6-skunberg.kelsey@gmail.com Signed-off-by: Kelsey Skunberg Signed-off-by: Bjorn Helgaas Signed-off-by: Guanjun Reviewed-by: Zelin Deng Reviewed-by: Shile Zhang --- drivers/pci/pci.h | 3 +++ include/linux/pci.h | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 2320203..8f5d0e0 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -196,6 +196,9 @@ static inline int pci_no_d1d2(struct pci_dev *dev) extern const struct device_type pci_dev_type; extern const struct attribute_group *pci_bus_groups[]; +extern unsigned long pci_hotplug_io_size; +extern unsigned long pci_hotplug_mem_size; +extern unsigned long pci_hotplug_bus_size; /** * pci_match_one_device - Tell if a PCI device structure has a matching diff --git a/include/linux/pci.h b/include/linux/pci.h index 125e2b7..1dd72e9 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1951,10 +1951,6 @@ int pcim_iomap_regions_request_all(struct pci_dev *pdev, int mask, extern u8 pci_dfl_cache_line_size; extern u8 pci_cache_line_size; -extern unsigned long pci_hotplug_io_size; -extern unsigned long pci_hotplug_mem_size; -extern unsigned long pci_hotplug_bus_size; - /* Architecture-specific versions may override these (weak) */ void pcibios_disable_device(struct pci_dev *dev); void pcibios_set_master(struct pci_dev *dev); -- 1.8.3.1