Avoid section mismatch involving arch_register_cpu
Avoid section mismatch involving arch_register_cpu.
Marking arch_register_cpu as __init and removing the export for non-hotplug-cpu configurations makes the following warning go away:
Section mismatch in reference from the function arch_register_cpu() to the function .devinit.text:register_cpu() The function arch_register_cpu() references
the function __devinit register_cpu().
This is often because arch_register_cpu lacks a __devinit annotation or the annotation of register_cpu is wrong.
The only external user of arch_register_cpu in the tree is in drivers/acpi/processor_core.c where it is guarded by ACPI_HOTPLUG_CPU (which depends on HOTPLUG_CPU).
arch/x86/kernel/topology.c +1 -2
@@ -57,11 +57,10 @@ void arch_unregister_cpu(int num) }EXPORT_SYMBOL (arch_unregister_cpu);#else -int arch_register_cpu (int num) +static int __init arch_register_cpu (int num) {return register_cpu (&per_cpu (cpu_devices, num).cpu, num); } -EXPORT_SYMBOL (arch_register_cpu);#endif /*CONFIG_HOTPLUG_CPU*/ static int __init topology_init (void )
include/asm-x86/cpu.h +2 -1
@@ -10,8 +10,9 @@struct x86_cpu {struct cpu cpu; }; -extern int arch_register_cpu (int num); +#ifdef CONFIG_HOTPLUG_CPU +extern int arch_register_cpu (int num);extern void arch_unregister_cpu (int );#endif
Hi Alexander.
See below for my take on the same warning.
It is already in x86.git pending merge.
Comments welcome.
Sam
Quoted 1 line
From
b7b4f3e109c742d32d255e04b7c2f90d08599ea8Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <[email protected]>
Date: Sat, 26 Jan 2008 21:25:08 +0100
Subject: [PATCH] x86: fix section mismatch warning in topology.c
Fix following warning:
WARNING: arch/x86/kernel/built-in.o(__ksymtab+0x2b0): Section mismatch: reference to .cpuinit.text:arch_register_cpu in '__ksymtab_arch_register_cpu'
Annotating exported symbols are wrong.
Previously the warning were hidden by avoiding the export in the non HOTPLUG_CPU case but the improved checks in modpost caught it anyway.
Fix it by removing the __cpuinit annotation and rearrange the code a bit to save one ifdef/endif pair.
--- arch/x86/kernel/topology.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-)
arch/x86/kernel/topology.c +9 -6
@@ -33,7 +33,8 @@ static DEFINE_PER_CPU(struct x86_cpu, cpu_devices); -int __cpuinit arch_register_cpu (int num) +#ifdef CONFIG_HOTPLUG_CPU +int arch_register_cpu (int num) {/* * CPU0 cannot be offlined due to several
@@ -44,21 +45,23 @@ int __cpuinit arch_register_cpu(int num)* Also certain PCI quirks require not to enable hotplug control * for all CPU's. */ -#ifdef CONFIG_HOTPLUG_CPU if (num)per_cpu (cpu_devices, num).cpu.hotpluggable =1 ; -#endif - return register_cpu(&per_cpu(cpu_devices, num).cpu, num); } +EXPORT_SYMBOL (arch_register_cpu); -#ifdef CONFIG_HOTPLUG_CPU void arch_unregister_cpu (int num) {return unregister_cpu (&per_cpu (cpu_devices, num).cpu); } -EXPORT_SYMBOL (arch_register_cpu);EXPORT_SYMBOL (arch_unregister_cpu); +#else +int arch_register_cpu (int num) +{ +return register_cpu (&per_cpu (cpu_devices, num).cpu, num); +} +EXPORT_SYMBOL (arch_register_cpu);#endif /*CONFIG_HOTPLUG_CPU*/ static int __init topology_init (void )
Signature · 1 line
1.5.4.rc3.14.g44397
Quoted 4 lines · Sam Ravnborg
Hi Alexander.
See below for my take on the same warning.
It is already in x86.git pending merge.
Hi!
The patch you forwarded is in Linus' tree already. It only changed one warning into another one, however. My guess is that you did not see the new warning due to inlining, but I compiled with CONFIG_CC_OPTIMIZE_FOR_SIZE=y.
Greetings,
Alexander
Signature · 5 lines
Alexander van Heukelum [email protected] -- http://www.fastmail.fm - And now for something completely different…
Quoted 8 lines · Alexander van Heukelum
Quoted 4 lines · Sam Ravnborg
Hi Alexander.
See below for my take on the same warning.
It is already in x86.git pending merge.
Quoted 6 lines
Hi!
The patch you forwarded is in Linus' tree already. It only changed one warning into another one, however. My guess is that you did not see the new warning due to inlining, but I compiled with
CONFIG_CC_OPTIMIZE_FOR_SIZE=y.
You are right - now I actually looked at your patch.
Sam
Sam Ravnborg
Acked-byQuoted 13 lines · Alexander van Heukelum
Avoid section mismatch involving
arch_register_cpu.Marking
arch_register_cpuas__initand removing the export for non-hotplug-cpu configurations makes the following warning go away:Section mismatch in reference from the function
arch_register_cpu()to the function .devinit.text:register_cpu() The functionarch_register_cpu()references
the function__devinitregister_cpu().
This is often becausearch_register_cpulacks a__devinitannotation or the annotation ofregister_cpuis wrong.
Quoted 6 lines
The only external user of
arch_register_cpuin the tree is indrivers/acpi/processor_core.cwhere it is guarded byACPI_HOTPLUG_CPU(which depends onHOTPLUG_CPU).Signed-off-by Alexander van Heukelum <[email protected]>CC Sam Ravnborg <[email protected]>
Added Ingo so he can pick it up.
Sam
Quoted 39 lines
arch/x86/kernel/topology.c +1
-2@@ -57,11 +57,10 @@ void arch_unregister_cpu(int num) }EXPORT_SYMBOL (arch_unregister_cpu);#else -int arch_register_cpu (int num) +static int __init arch_register_cpu (int num) {return register_cpu (&per_cpu (cpu_devices, num).cpu, num); } -EXPORT_SYMBOL (arch_register_cpu);#endif /*CONFIG_HOTPLUG_CPU*/ static int __init topology_init (void )include/asm-x86/cpu.h +2
-2@@ -10,8 +10,9 @@struct x86_cpu {struct cpu cpu; }; -extern int arch_register_cpu (int num); +#ifdef CONFIG_HOTPLUG_CPU +extern int arch_register_cpu (int num);extern void arch_unregister_cpu (int );#endif --To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Quoted 9 lines · Sam Ravnborg
Quoted 6 lines
The only external user of
arch_register_cpuin the tree is indrivers/acpi/processor_core.cwhere it is guarded byACPI_HOTPLUG_CPU(which depends onHOTPLUG_CPU).Signed-off-by Alexander van Heukelum <[email protected]>CC Sam Ravnborg <[email protected]>Acked-by Sam Ravnborg <[email protected]>Added Ingo so he can pick it up.
yep, already did so.
Ingo