x86: unify smp_send_stop

function definition is moved to common header.
x86_64 version is now called native_smp_send_stop

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/smp_64.c b/arch/x86/kernel/smp_64.c
index 4e1e2bce969ceb0317dd360bf72d6c32641a8473..ad11ef0c3fae6fb4d641ddf7fbb22f0896d1bad8 100644 (file)
--- a/arch/x86/kernel/smp_64.c
+++ b/arch/x86/kernel/smp_64.c
@@ -421,7 +421,7 @@ static void stop_this_cpu(void *dummy)
        for (;;);
 }
 
-void smp_send_stop(void)
+void native_smp_send_stop(void)
 {
        int nolock;
        unsigned long flags;
@@ -482,6 +482,7 @@ struct smp_ops smp_ops = {
        .smp_prepare_cpus = native_smp_prepare_cpus,
        .smp_cpus_done = native_smp_cpus_done,
 
+       .smp_send_stop = native_smp_send_stop,
        .smp_send_reschedule = native_smp_send_reschedule,
        .smp_call_function_mask = native_smp_call_function_mask,
        .cpu_up = native_cpu_up,

diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index 28cb1f8bb47e86f5903a8d54735730d9cf250abb..2ab8ed4e99e0619a043062a7a440041ef4f98b6d 100644 (file)
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -25,6 +25,11 @@ struct smp_ops {
 #ifdef CONFIG_SMP
 extern struct smp_ops smp_ops;
 
+static inline void smp_send_stop(void)
+{
+       smp_ops.smp_send_stop();
+}
+
 static inline void smp_prepare_boot_cpu(void)
 {
        smp_ops.smp_prepare_boot_cpu();

diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
index bc90a4ed32355fee564e88fc04eab8d85d9f5622..41b58e0bc75b8e359bd21464e7e0dad164649100 100644 (file)
--- a/include/asm-x86/smp_32.h
+++ b/include/asm-x86/smp_32.h
@@ -39,11 +39,6 @@ extern void remove_siblinginfo(int cpu);
 extern void set_cpu_sibling_map(int cpu);
 
 #ifdef CONFIG_SMP
-static inline void smp_send_stop(void)
-{
-       smp_ops.smp_send_stop();
-}
-
 #ifndef CONFIG_PARAVIRT
 #define startup_ipi_hook(phys_apicid, start_eip, start_esp) do { } while (0)
 #endif