aboutsummaryrefslogtreecommitdiff
path: root/include/asm-x86
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-03-03 14:12:36 -0300
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:40:53 +0200
commit71d195492a6e0b22135a7156af1b41c0f99a116b (patch)
tree8c6606c1dcdf6b225c90ece08fe44b60f85bc52c /include/asm-x86
parent64b1a21e0924dca7ea3b7cf4287fa719c8ba7fc5 (diff)
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 'include/asm-x86')
-rw-r--r--include/asm-x86/smp.h7
-rw-r--r--include/asm-x86/smp_32.h5
2 files changed, 7 insertions, 5 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index d9782f4f469..7dd71410fe7 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -24,6 +24,11 @@ struct smp_ops {
#ifdef CONFIG_SMP
extern struct smp_ops smp_ops;
+static inline int __cpu_up(unsigned int cpu)
+{
+ return smp_ops.cpu_up(cpu);
+}
+
static inline void smp_send_reschedule(int cpu)
{
smp_ops.smp_send_reschedule(cpu);
@@ -35,6 +40,8 @@ static inline int smp_call_function_mask(cpumask_t mask,
{
return smp_ops.smp_call_function_mask(mask, func, info, wait);
}
+
+int native_cpu_up(unsigned int cpunum);
#endif
#ifdef CONFIG_X86_32
diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
index d9337ee8c2f..a7fab8e1517 100644
--- a/include/asm-x86/smp_32.h
+++ b/include/asm-x86/smp_32.h
@@ -47,10 +47,6 @@ static inline void smp_prepare_cpus(unsigned int max_cpus)
{
smp_ops.smp_prepare_cpus(max_cpus);
}
-static inline int __cpu_up(unsigned int cpu)
-{
- return smp_ops.cpu_up(cpu);
-}
static inline void smp_cpus_done(unsigned int max_cpus)
{
smp_ops.smp_cpus_done(max_cpus);
@@ -63,7 +59,6 @@ static inline void smp_send_stop(void)
void native_smp_prepare_boot_cpu(void);
void native_smp_prepare_cpus(unsigned int max_cpus);
-int native_cpu_up(unsigned int cpunum);
void native_smp_cpus_done(unsigned int max_cpus);
#ifndef CONFIG_PARAVIRT