aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-03-03 12:12:36 -0500
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:40:53 -0400
commit71d195492a6e0b22135a7156af1b41c0f99a116b (patch)
tree8c6606c1dcdf6b225c90ece08fe44b60f85bc52c
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>
-rw-r--r--arch/x86/kernel/smp_64.c1
-rw-r--r--arch/x86/kernel/smpboot_64.c2
-rw-r--r--include/asm-x86/smp.h7
-rw-r--r--include/asm-x86/smp_32.h5
4 files changed, 9 insertions, 6 deletions
diff --git a/arch/x86/kernel/smp_64.c b/arch/x86/kernel/smp_64.c
index 225b765db5a2..7cc20a3c6c19 100644
--- a/arch/x86/kernel/smp_64.c
+++ b/arch/x86/kernel/smp_64.c
@@ -532,5 +532,6 @@ asmlinkage void smp_call_function_interrupt(void)
532struct smp_ops smp_ops = { 532struct smp_ops smp_ops = {
533 .smp_send_reschedule = native_smp_send_reschedule, 533 .smp_send_reschedule = native_smp_send_reschedule,
534 .smp_call_function_mask = native_smp_call_function_mask, 534 .smp_call_function_mask = native_smp_call_function_mask,
535 .cpu_up = native_cpu_up,
535}; 536};
536EXPORT_SYMBOL_GPL(smp_ops); 537EXPORT_SYMBOL_GPL(smp_ops);
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)
929/* 929/*
930 * Entry point to boot a CPU. 930 * Entry point to boot a CPU.
931 */ 931 */
932int __cpuinit __cpu_up(unsigned int cpu) 932int __cpuinit native_cpu_up(unsigned int cpu)
933{ 933{
934 int apicid = cpu_present_to_apicid(cpu); 934 int apicid = cpu_present_to_apicid(cpu);
935 unsigned long flags; 935 unsigned long flags;
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index d9782f4f469e..7dd71410fe7d 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -24,6 +24,11 @@ struct smp_ops {
24#ifdef CONFIG_SMP 24#ifdef CONFIG_SMP
25extern struct smp_ops smp_ops; 25extern struct smp_ops smp_ops;
26 26
27static inline int __cpu_up(unsigned int cpu)
28{
29 return smp_ops.cpu_up(cpu);
30}
31
27static inline void smp_send_reschedule(int cpu) 32static inline void smp_send_reschedule(int cpu)
28{ 33{
29 smp_ops.smp_send_reschedule(cpu); 34 smp_ops.smp_send_reschedule(cpu);
@@ -35,6 +40,8 @@ static inline int smp_call_function_mask(cpumask_t mask,
35{ 40{
36 return smp_ops.smp_call_function_mask(mask, func, info, wait); 41 return smp_ops.smp_call_function_mask(mask, func, info, wait);
37} 42}
43
44int native_cpu_up(unsigned int cpunum);
38#endif 45#endif
39 46
40#ifdef CONFIG_X86_32 47#ifdef CONFIG_X86_32
diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
index d9337ee8c2fc..a7fab8e1517a 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)
47{ 47{
48 smp_ops.smp_prepare_cpus(max_cpus); 48 smp_ops.smp_prepare_cpus(max_cpus);
49} 49}
50static inline int __cpu_up(unsigned int cpu)
51{
52 return smp_ops.cpu_up(cpu);
53}
54static inline void smp_cpus_done(unsigned int max_cpus) 50static inline void smp_cpus_done(unsigned int max_cpus)
55{ 51{
56 smp_ops.smp_cpus_done(max_cpus); 52 smp_ops.smp_cpus_done(max_cpus);
@@ -63,7 +59,6 @@ static inline void smp_send_stop(void)
63 59
64void native_smp_prepare_boot_cpu(void); 60void native_smp_prepare_boot_cpu(void);
65void native_smp_prepare_cpus(unsigned int max_cpus); 61void native_smp_prepare_cpus(unsigned int max_cpus);
66int native_cpu_up(unsigned int cpunum);
67void native_smp_cpus_done(unsigned int max_cpus); 62void native_smp_cpus_done(unsigned int max_cpus);
68 63
69#ifndef CONFIG_PARAVIRT 64#ifndef CONFIG_PARAVIRT