diff options
| author | Alexander van Heukelum <heukelum@mailshack.com> | 2008-02-01 17:49:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-02-01 17:49:43 +0100 |
| commit | d987402695f16ae33999d7315b915099d64616d4 (patch) | |
| tree | b00856b58d688e0c981a0849ea509f82ead586df | |
| parent | 93809be8b140c101d27f00d0a622ebac90bc7a67 (diff) | |
x86: 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).
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
CC: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/topology.c | 3 | ||||
| -rw-r--r-- | include/asm-x86/cpu.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c index 78cbb655aa7..e6757aaa202 100644 --- a/arch/x86/kernel/topology.c +++ b/arch/x86/kernel/topology.c @@ -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) diff --git a/include/asm-x86/cpu.h b/include/asm-x86/cpu.h index 85ece5f10e9..73f2ea84fd7 100644 --- a/include/asm-x86/cpu.h +++ b/include/asm-x86/cpu.h @@ -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 |