summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-12-04 17:19:07 +0100
committerIngo Molnar <mingo@elte.hu>2007-12-04 17:19:07 +0100
commitda54becc7166b5fad70538acea5e93bdd83dd8a6 (patch)
tree1846928376deaa0222234ee7de9e8e845ad112bf /arch/x86
parentf22d9bc1e87270586610216084b00cb2fb09abba (diff)
downloadop-kernel-dev-da54becc7166b5fad70538acea5e93bdd83dd8a6.zip
op-kernel-dev-da54becc7166b5fad70538acea5e93bdd83dd8a6.tar.gz
x86: arch_register_cpu() section fix
fix this on i386 allnoconfig: WARNING: vmlinux.o(.text+0x6f2e): Section mismatch: reference to .init.text:register_cpu (between 'arch_register_cpu' and 'text_poke') Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/topology.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c
index 8caa0b7..7e16d67 100644
--- a/arch/x86/kernel/topology.c
+++ b/arch/x86/kernel/topology.c
@@ -33,7 +33,7 @@
static struct i386_cpu cpu_devices[NR_CPUS];
-int arch_register_cpu(int num)
+int __cpuinit arch_register_cpu(int num)
{
/*
* CPU0 cannot be offlined due to several
@@ -53,7 +53,8 @@ int arch_register_cpu(int num)
}
#ifdef CONFIG_HOTPLUG_CPU
-void arch_unregister_cpu(int num) {
+void arch_unregister_cpu(int num)
+{
return unregister_cpu(&cpu_devices[num].cpu);
}
EXPORT_SYMBOL(arch_register_cpu);
OpenPOWER on IntegriCloud