X86: pci, fix section mismatches
PATCH 1/1 X86: pci, fix section mismatches
pcibios_scan_specific_bus calls pci_scan_bus_on_node which is __devinit. Mark it __devinit as well. All users are now __init or __devinit.
Remark update_res from __init to __devinit as it is called also from __devinit functions.
--- arch/x86/pci/bus_numa.c | 2 +- arch/x86/pci/legacy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/pci/bus_numa.c +1 -1
@@ -51,7 +51,7 @@ void x86_pci_root_bus_res_quirks(struct pci_bus *b) } } -void __init update_res (struct pci_root_info *info,size_t start, +void __devinit update_res (struct pci_root_info *info,size_t start,size_t end,unsigned long flags,int merge) {int i;
arch/x86/pci/legacy.c +1 -1
@@ -39,7 +39,7 @@ static int __init pci_legacy_init(void)return 0 ; } -void pcibios_scan_specific_bus (int busn) +void __devinit pcibios_scan_specific_bus (int busn) {int devfn;long node;
Signature · 1 line
1.6.5.3
Quoted 34 lines · Jiri Slaby
pcibios_scan_specific_buscallspci_scan_bus_on_nodewhich is__devinit. Mark it__devinitas well. All users are now__initor__devinit.Remark
update_resfrom__initto__devinitas it is called also from__devinitfunctions.Signed-off-by Jiri Slaby <[email protected]>Cc Aristeu Sergio <[email protected]>Cc Jesse Barnes <[email protected]>--- arch/x86/pci/bus_numa.c | 2 +- arch/x86/pci/legacy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)arch/x86/pci/bus_numa.c +1
-1@@ -51,7 +51,7 @@ void x86_pci_root_bus_res_quirks(struct pci_bus *b) } } -void __init update_res (struct pci_root_info *info,size_t start, +void __devinit update_res (struct pci_root_info *info,size_t start,size_t end,unsigned long flags,int merge) {int i;arch/x86/pci/legacy.c +0
-0
arch/x86/pci/legacy.c static int __init pci_legacy_init(void) · line 45
Quoted 8 lines
arch/x86/pci/legacy.c +1
-1@@ -39,7 +39,7 @@ static int __init pci_legacy_init(void)return 0 ; } -void pcibios_scan_specific_bus (int busn) +void __devinit pcibios_scan_specific_bus (int busn) {int devfn;long node;
It seems that the pcibios_scan_specific_bus() is not available on Linus's tree yet.
And according to the linux-next/master, this function is now exported by EXPORT_SYMBOL_GPL(). So latter hunk is not appropriate.
I have no complain about the former hunk.
Thanks,
H.Seto