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.h7
2 files changed, 6 insertions, 7 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index 31bd99ddd8c2..9620165d3b78 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -34,6 +34,11 @@ static inline void smp_prepare_cpus(unsigned int max_cpus)
34 smp_ops.smp_prepare_cpus(max_cpus); 34 smp_ops.smp_prepare_cpus(max_cpus);
35} 35}
36 36
37static inline void smp_cpus_done(unsigned int max_cpus)
38{
39 smp_ops.smp_cpus_done(max_cpus);
40}
41
37static inline int __cpu_up(unsigned int cpu) 42static inline int __cpu_up(unsigned int cpu)
38{ 43{
39 return smp_ops.cpu_up(cpu); 44 return smp_ops.cpu_up(cpu);
@@ -53,6 +58,7 @@ static inline int smp_call_function_mask(cpumask_t mask,
53 58
54void native_smp_prepare_boot_cpu(void); 59void native_smp_prepare_boot_cpu(void);
55void native_smp_prepare_cpus(unsigned int max_cpus); 60void native_smp_prepare_cpus(unsigned int max_cpus);
61void native_smp_cpus_done(unsigned int max_cpus);
56int native_cpu_up(unsigned int cpunum); 62int native_cpu_up(unsigned int cpunum);
57#endif 63#endif
58 64
diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
index 50785389680b..bc90a4ed3235 100644
--- a/include/asm-x86/smp_32.h
+++ b/include/asm-x86/smp_32.h
@@ -39,18 +39,11 @@ 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_cpus_done(unsigned int max_cpus)
43{
44 smp_ops.smp_cpus_done(max_cpus);
45}
46
47static inline void smp_send_stop(void) 42static inline void smp_send_stop(void)
48{ 43{
49 smp_ops.smp_send_stop(); 44 smp_ops.smp_send_stop();
50} 45}
51 46
52void native_smp_cpus_done(unsigned int max_cpus);
53
54#ifndef CONFIG_PARAVIRT 47#ifndef CONFIG_PARAVIRT
55#define startup_ipi_hook(phys_apicid, start_eip, start_esp) do { } while (0) 48#define startup_ipi_hook(phys_apicid, start_eip, start_esp) do { } while (0)
56#endif 49#endif