x86: silence section mismatch warning - uv_cpu_init
Quoted 54 lines
WARNING:
vmlinux.o(.cpuinit.text+0x3cc4): Section mismatch in reference from the functionuv_cpu_init()to the function .init.text:uv_system_init() The function__cpuinituv_cpu_init()references
a function__inituv_system_init().
Ifuv_system_initis only used byuv_cpu_initthen
annotateuv_system_initwith a matching annotation.
uv_system_initwas ment to be called only once, so make explicit by creating properly-named function and annotate it as__ref.Old code relied on
uv_node_to_bladebeing initialized to 0, but it'a not initialized from anywhere and it's not static either.Signed-off-by Marcin Slusarz<[email protected]>Cc Ingo Molnar<[email protected]>Cc Jack Steiner<[email protected]>--- arch/x86/kernel/genx2apic_uv_x.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-)arch/x86/kernel/genx2apic_uv_x.c +12
-2@@ -385,14 +385,24 @@ static __init void uv_system_init(void)map_mmioh_high (max_pnode); } +/* Wrapper for uv_system_init which calls it only once. */ +static void __ref uv_system_init_once (void ) +{ +static bool uv_system_inited = false; + +if (!uv_system_inited) { +uv_system_init (); + uv_system_inited = true; + } +} +/* * Called on each cpu to initialize the per_cpu UV data area. * ZZZ hotplug not supported yet */ void __cpuinit uv_cpu_init (void ) { -if (!uv_node_to_blade) -uv_system_init (); +uv_system_init_once (); uv_blade_info[uv_numa_blade_id ()].nr_online_cpus++;Signature · 1 line
1.5.4.5
Hi Marcin,
Your patch works fine on my box and section mismatch desappears.
Thanks.
Regards.
P.S. : 3 section mimsatches are remaining unsolved at this time on my config :
WARNING: vmlinux.o(.meminit.text+0x2f2): Section mismatch in reference from the function alloc_low_page() to the function .init.text:early_ioremap() The function __meminit alloc_low_page() references
a function __init early_ioremap().
If early_ioremap is only used by alloc_low_page then
annotate early_ioremap with a matching annotation.
WARNING: vmlinux.o(.meminit.text+0x608): Section mismatch in reference from the function phys_pmd_init() to the function .init.text:early_iounmap() The function __meminit phys_pmd_init() references
a function __init early_iounmap().
If early_iounmap is only used by phys_pmd_init then
annotate early_iounmap with a matching annotation.
WARNING: vmlinux.o(.meminit.text+0x861): Section mismatch in reference from the function phys_pud_init() to the function .init.text:early_iounmap() The function __meminit phys_pud_init() references
a function __init early_iounmap().
If early_iounmap is only used by phys_pud_init then
annotate early_iounmap with a matching annotation.