[PATCH] x86: fix section mismatch from pcibios_scan_specific_bus()

From: Jan Beulich
Date: Thu Jun 24 2010 - 11:21:11 EST

This so far non-__devinit function calling a __devinit one
(pci_scan_bus_on_node()) isn't correct, but since it is being exported
it also cannot itself be made __devinit unconditionally. Short of being
able to think of a better solution, and short of making the whole call
tree (reaching into the arch-independent part of the PCI subsystem)
non-__devinit, export the symbol only when HOTPLUG is enabled (which
is always the case for non-embedded configurations), use section
mismatch avoidance annotations for (knowing that __devinit functions
will not be discarded in) that case, and mark the symbol __devinit only
in the !HOTPLUG case.

Consequently, EDAC_I7CORE (consuming the export) then has to depend on

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Cc: Aristeu Sergio <arozansk@xxxxxxxxxx>

arch/x86/pci/legacy.c | 21 ++++++++++++++++++---
drivers/edac/Kconfig | 2 +-
2 files changed, 19 insertions(+), 4 deletions(-)

--- linux-2.6.35-rc3/arch/x86/pci/legacy.c
+++ 2.6.35-rc3-x86-pci-legacy-sections/arch/x86/pci/legacy.c
@@ -36,7 +36,23 @@ int __init pci_legacy_init(void)
return 0;

-void pcibios_scan_specific_bus(int busn)
+static void __ref
+static inline void
+_pci_scan_bus_on_node(int busno, int node)
+ pci_scan_bus_on_node(busno, &pci_root_ops, node);
+void __devinit
+pcibios_scan_specific_bus(int busn)
int devfn;
long node;
@@ -51,12 +67,11 @@ void pcibios_scan_specific_bus(int busn)
l != 0x0000 && l != 0xffff) {
DBG("Found device at %02x:%02x [%04x]\n", busn, devfn, l);
printk(KERN_INFO "PCI: Discovered peer bus %02x\n", busn);
- pci_scan_bus_on_node(busn, &pci_root_ops, node);
+ _pci_scan_bus_on_node(busn, node);

int __init pci_subsys_init(void)
--- linux-2.6.35-rc3/drivers/edac/Kconfig
+++ 2.6.35-rc3-x86-pci-legacy-sections/drivers/edac/Kconfig
@@ -171,7 +171,7 @@ config EDAC_I5400

config EDAC_I7CORE
tristate "Intel i7 Core (Nehalem) processors"
- depends on EDAC_MM_EDAC && PCI && X86
+ depends on EDAC_MM_EDAC && PCI && X86 && HOTPLUG
select EDAC_MCE
Support for error detection and correction the Intel

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/