Skip to content

Commit

Permalink
PCI: fix section mismatch warnings referring to pci_do_scan_bus
Browse files Browse the repository at this point in the history
Fix following warnings:
WARNING: o-x86_64/drivers/pci/built-in.o(.text+0xb054): Section mismatch in reference from the function cpci_configure_slot() to the function .devinit.text:pci_do_scan_bus()
WARNING: o-x86_64/drivers/pci/built-in.o(.text+0x153ab): Section mismatch in reference from the function shpchp_configure_device() to the function .devinit.text:pci_do_scan_bus()
WARNING: o-x86_64/drivers/pci/built-in.o(__ksymtab+0xc0): Section mismatch in reference from the variable __ksymtab_pci_do_scan_bus to the function .devinit.text:pci_do_scan_bus()

PCI hotplug were the only user of pci_do_scan_bus()
so moving this function to a separate file that is build
only when we enable CONFIG_HOTPLUG_PCI.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Sam Ravnborg authored and Greg Kroah-Hartman committed Feb 2, 2008
1 parent d5f78fb commit 4105717
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 15 deletions.
3 changes: 3 additions & 0 deletions drivers/pci/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ obj-$(CONFIG_HOTPLUG) += hotplug.o

# Build the PCI Hotplug drivers if we were asked to
obj-$(CONFIG_HOTPLUG_PCI) += hotplug/
ifdef CONFIG_HOTPLUG_PCI
obj-y += hotplug-pci.o
endif

# Build the PCI MSI interrupt support
obj-$(CONFIG_PCI_MSI) += msi.o
Expand Down
20 changes: 20 additions & 0 deletions drivers/pci/hotplug-pci.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/* Core PCI functionality used only by PCI hotplug */

#include <linux/pci.h>
#include "pci.h"


unsigned int pci_do_scan_bus(struct pci_bus *bus)
{
unsigned int max;

max = pci_scan_child_bus(bus);

/*
* Make the discovered devices available.
*/
pci_bus_add_devices(bus);

return max;
}
EXPORT_SYMBOL(pci_do_scan_bus);
15 changes: 0 additions & 15 deletions drivers/pci/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -1040,20 +1040,6 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus)
return max;
}

unsigned int __devinit pci_do_scan_bus(struct pci_bus *bus)
{
unsigned int max;

max = pci_scan_child_bus(bus);

/*
* Make the discovered devices available.
*/
pci_bus_add_devices(bus);

return max;
}

struct pci_bus * pci_create_bus(struct device *parent,
int bus, struct pci_ops *ops, void *sysdata)
{
Expand Down Expand Up @@ -1140,7 +1126,6 @@ EXPORT_SYMBOL(pci_scan_bus_parented);

#ifdef CONFIG_HOTPLUG
EXPORT_SYMBOL(pci_add_new_bus);
EXPORT_SYMBOL(pci_do_scan_bus);
EXPORT_SYMBOL(pci_scan_slot);
EXPORT_SYMBOL(pci_scan_bridge);
EXPORT_SYMBOL_GPL(pci_scan_child_bus);
Expand Down

0 comments on commit 4105717

Please sign in to comment.