x86: unify smp_cpus_done
definition is moved to common header. x86_64 version is now called
native_smp_cpus_done
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index 31bd99d..9620165 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -34,6 +34,11 @@
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)
{
return smp_ops.cpu_up(cpu);
@@ -53,6 +58,7 @@
void native_smp_prepare_boot_cpu(void);
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);
#endif
diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
index 5078538..bc90a4e 100644
--- a/include/asm-x86/smp_32.h
+++ b/include/asm-x86/smp_32.h
@@ -39,18 +39,11 @@
extern void set_cpu_sibling_map(int cpu);
#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)
{
smp_ops.smp_send_stop();
}
-void native_smp_cpus_done(unsigned int max_cpus);
-
#ifndef CONFIG_PARAVIRT
#define startup_ipi_hook(phys_apicid, start_eip, start_esp) do { } while (0)
#endif