Commit c5597649 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar

x86: unify smp_cpus_done

definition is moved to common header. x86_64 version is now called
native_smp_cpus_done
Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 7557da67
...@@ -532,6 +532,8 @@ asmlinkage void smp_call_function_interrupt(void) ...@@ -532,6 +532,8 @@ asmlinkage void smp_call_function_interrupt(void)
struct smp_ops smp_ops = { struct smp_ops smp_ops = {
.smp_prepare_boot_cpu = native_smp_prepare_boot_cpu, .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
.smp_prepare_cpus = native_smp_prepare_cpus, .smp_prepare_cpus = native_smp_prepare_cpus,
.smp_cpus_done = native_smp_cpus_done,
.smp_send_reschedule = native_smp_send_reschedule, .smp_send_reschedule = native_smp_send_reschedule,
.smp_call_function_mask = native_smp_call_function_mask, .smp_call_function_mask = native_smp_call_function_mask,
.cpu_up = native_cpu_up, .cpu_up = native_cpu_up,
......
...@@ -987,7 +987,7 @@ int __cpuinit native_cpu_up(unsigned int cpu) ...@@ -987,7 +987,7 @@ int __cpuinit native_cpu_up(unsigned int cpu)
/* /*
* Finish the SMP boot. * Finish the SMP boot.
*/ */
void __init smp_cpus_done(unsigned int max_cpus) void __init native_smp_cpus_done(unsigned int max_cpus)
{ {
smp_cleanup_boot(); smp_cleanup_boot();
setup_ioapic_dest(); setup_ioapic_dest();
......
...@@ -34,6 +34,11 @@ static inline void smp_prepare_cpus(unsigned int max_cpus) ...@@ -34,6 +34,11 @@ static inline void smp_prepare_cpus(unsigned int max_cpus)
smp_ops.smp_prepare_cpus(max_cpus); smp_ops.smp_prepare_cpus(max_cpus);
} }
static inline void smp_cpus_done(unsigned int max_cpus)
{
smp_ops.smp_cpus_done(max_cpus);
}
static inline int __cpu_up(unsigned int cpu) static inline int __cpu_up(unsigned int cpu)
{ {
return smp_ops.cpu_up(cpu); return smp_ops.cpu_up(cpu);
...@@ -53,6 +58,7 @@ static inline int smp_call_function_mask(cpumask_t mask, ...@@ -53,6 +58,7 @@ static inline int smp_call_function_mask(cpumask_t mask,
void native_smp_prepare_boot_cpu(void); void native_smp_prepare_boot_cpu(void);
void native_smp_prepare_cpus(unsigned int max_cpus); void native_smp_prepare_cpus(unsigned int max_cpus);
void native_smp_cpus_done(unsigned int max_cpus);
int native_cpu_up(unsigned int cpunum); int native_cpu_up(unsigned int cpunum);
#endif #endif
......
...@@ -39,18 +39,11 @@ extern void remove_siblinginfo(int cpu); ...@@ -39,18 +39,11 @@ extern void remove_siblinginfo(int cpu);
extern void set_cpu_sibling_map(int cpu); extern void set_cpu_sibling_map(int cpu);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
static inline void smp_cpus_done(unsigned int max_cpus)
{
smp_ops.smp_cpus_done(max_cpus);
}
static inline void smp_send_stop(void) static inline void smp_send_stop(void)
{ {
smp_ops.smp_send_stop(); smp_ops.smp_send_stop();
} }
void native_smp_cpus_done(unsigned int max_cpus);
#ifndef CONFIG_PARAVIRT #ifndef CONFIG_PARAVIRT
#define startup_ipi_hook(phys_apicid, start_eip, start_esp) do { } while (0) #define startup_ipi_hook(phys_apicid, start_eip, start_esp) do { } while (0)
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment