lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: fix section mismatch warning in topology.c

Browse Source 
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.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Sam Ravnborg
2008-01-30 13:33:37 +01:00
committed by Ingo Molnar
parent 1e296f578a
commit 3eaf5efae7
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/x86/kernel/topology.c
View File

@@ -33,7 +33,8 @@
static DEFINE_PER_CPU(struct x86_cpu, cpu_devices); 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 * 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 * Also certain PCI quirks require not to enable hotplug control
* for all CPU's. * for all CPU's.
*/ */
#ifdef CONFIG_HOTPLUG_CPU
if (num) if (num)
per_cpu(cpu_devices, num).cpu.hotpluggable = 1; per_cpu(cpu_devices, num).cpu.hotpluggable = 1;
#endif
return register_cpu(&per_cpu(cpu_devices, num).cpu, num); 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) void arch_unregister_cpu(int num)
{ {
return unregister_cpu(&per_cpu(cpu_devices, num).cpu); return unregister_cpu(&per_cpu(cpu_devices, num).cpu);
} }
EXPORT_SYMBOL(arch_register_cpu);
EXPORT_SYMBOL(arch_unregister_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*/ #endif /*CONFIG_HOTPLUG_CPU*/
static int __init topology_init(void) static int __init topology_init(void)