summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/smpboot_64.c
diff options
context:
space:
mode:
authorGlauber Costa2008-03-03 18:12:36 +0100
committerIngo Molnar2008-04-17 17:40:53 +0200
commit71d195492a6e0b22135a7156af1b41c0f99a116b (patch)
tree8c6606c1dcdf6b225c90ece08fe44b60f85bc52c /arch/x86/kernel/smpboot_64.c
parentx86: unify smp_call_function_mask (diff)
downloadkernel-qcow2-linux-71d195492a6e0b22135a7156af1b41c0f99a116b.tar.gz
kernel-qcow2-linux-71d195492a6e0b22135a7156af1b41c0f99a116b.tar.xz
kernel-qcow2-linux-71d195492a6e0b22135a7156af1b41c0f99a116b.zip
x86: unify __cpu_up.
function definition is moved to common header. x86_64 version is now called native_cpu_up Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot_64.c')
-rw-r--r--arch/x86/kernel/smpboot_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
index 0880f2c388a9..e381fe7792c4 100644
--- a/arch/x86/kernel/smpboot_64.c
+++ b/arch/x86/kernel/smpboot_64.c
@@ -929,7 +929,7 @@ void __init smp_prepare_boot_cpu(void)
/*
* Entry point to boot a CPU.
*/
-int __cpuinit __cpu_up(unsigned int cpu)
+int __cpuinit native_cpu_up(unsigned int cpu)
{
int apicid = cpu_present_to_apicid(cpu);
unsigned long flags;