aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/smp.h6
-rw-r--r--include/asm-x86/smp_32.h5
2 files changed, 6 insertions, 5 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index 7dd71410fe7d..a2d69a1bec24 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 void smp_prepare_boot_cpu(void)
28{
29 smp_ops.smp_prepare_boot_cpu();
30}
31
27static inline int __cpu_up(unsigned int cpu) 32static inline int __cpu_up(unsigned int cpu)
28{ 33{
29 return smp_ops.cpu_up(cpu); 34 return smp_ops.cpu_up(cpu);
@@ -41,6 +46,7 @@ static inline int smp_call_function_mask(cpumask_t mask,
41 return smp_ops.smp_call_function_mask(mask, func, info, wait); 46 return smp_ops.smp_call_function_mask(mask, func, info, wait);
42} 47}
43 48
49void native_smp_prepare_boot_cpu(void);
44int native_cpu_up(unsigned int cpunum); 50int native_cpu_up(unsigned int cpunum);
45#endif 51#endif
46 52
diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
index a7fab8e1517a..2c7ecfaa8234 100644
--- a/include/asm-x86/smp_32.h
+++ b/include/asm-x86/smp_32.h
@@ -39,10 +39,6 @@ extern void remove_siblinginfo(int cpu);
39extern void set_cpu_sibling_map(int cpu); 39extern void set_cpu_sibling_map(int cpu);
40 40
41#ifdef CONFIG_SMP 41#ifdef CONFIG_SMP
42static inline void smp_prepare_boot_cpu(void)
43{
44 smp_ops.smp_prepare_boot_cpu();
45}
46static inline void smp_prepare_cpus(unsigned int max_cpus) 42static inline void smp_prepare_cpus(unsigned int max_cpus)
47{ 43{
48 smp_ops.smp_prepare_cpus(max_cpus); 44 smp_ops.smp_prepare_cpus(max_cpus);
@@ -57,7 +53,6 @@ static inline void smp_send_stop(void)
57 smp_ops.smp_send_stop(); 53 smp_ops.smp_send_stop();
58} 54}
59 55
60void native_smp_prepare_boot_cpu(void);
61void native_smp_prepare_cpus(unsigned int max_cpus); 56void native_smp_prepare_cpus(unsigned int max_cpus);
62void native_smp_cpus_done(unsigned int max_cpus); 57void native_smp_cpus_done(unsigned int max_cpus);
63 58