From sam@ravnborg.org Sat Feb 2 13:51:26 2008 From: Sam Ravnborg Date: Sat, 2 Feb 2008 22:33:43 +0100 Subject: PCI: fix 4x section mismatch warnings To: Greg KH Message-ID: <20080202213343.GC27015@uranus.ravnborg.org> Content-Disposition: inline From: Sam Ravnborg The following warnings were issued during build of drivers/pci with an allyesconfig build: WARNING: o-x86_64/drivers/pci/built-in.o(.text+0xdaf): Section mismatch in reference from the function pci_add_new_bus() to the function .devinit.text:pci_alloc_child_bus() WARNING: o-x86_64/drivers/pci/built-in.o(.text+0x15e2): Section mismatch in reference from the function pci_scan_single_device() to the function .devinit.text:pci_scan_device() WARNING: o-x86_64/drivers/pci/built-in.o(.text+0x1b0c5): Section mismatch in reference from the function pci_bus_assign_resources() to the function .devinit.text:pci_setup_bridge() WARNING: o-x86_64/drivers/pci/built-in.o(.text+0x1b32d): Section mismatch in reference from the function pci_bus_size_bridges() to the function .devinit.text:pci_bus_size_cardbus() Investigating each case closer it looked like all referred functions are only used in the init phase or during hotplug. So to avoid wasting too much memory in the non-hotplug case the simpler fix was to allow the fuctions to use code/data from the __devinit sections. This was done in all four case by adding the __ref annotation. Signed-off-by: Sam Ravnborg Cc: Adrian Bunk Signed-off-by: Greg Kroah-Hartman --- drivers/pci/probe.c | 5 +++-- drivers/pci/setup-bus.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -434,7 +434,8 @@ pci_alloc_child_bus(struct pci_bus *pare return child; } -struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int busnr) +struct pci_bus *__ref pci_add_new_bus(struct pci_bus *parent, + struct pci_dev *dev, int busnr) { struct pci_bus *child; @@ -949,7 +950,7 @@ void pci_device_add(struct pci_dev *dev, up_write(&pci_bus_sem); } -struct pci_dev *pci_scan_single_device(struct pci_bus *bus, int devfn) +struct pci_dev *__ref pci_scan_single_device(struct pci_bus *bus, int devfn) { struct pci_dev *dev; --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -456,7 +456,7 @@ pci_bus_size_cardbus(struct pci_bus *bus } } -void pci_bus_size_bridges(struct pci_bus *bus) +void __ref pci_bus_size_bridges(struct pci_bus *bus) { struct pci_dev *dev; unsigned long mask, prefmask; @@ -511,7 +511,7 @@ void pci_bus_size_bridges(struct pci_bus } EXPORT_SYMBOL(pci_bus_size_bridges); -void pci_bus_assign_resources(struct pci_bus *bus) +void __ref pci_bus_assign_resources(struct pci_bus *bus) { struct pci_bus *b; struct pci_dev *dev;