aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-03-03 12:12:51 -0500
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:40:56 -0400
commit377d698426b8c685fb6d48fe89694fe4ce3aa1f8 (patch)
treeb7f14ee713660b01007385c00bfe85c12efd84c2 /include
parent321183c145a37e6d31cc55e0f69a226f9006e621 (diff)
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>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/smp.h5
-rw-r--r--include/asm-x86/smp_32.h5
2 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index 28cb1f8bb47e..2ab8ed4e99e0 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -25,6 +25,11 @@ struct smp_ops {
25#ifdef CONFIG_SMP 25#ifdef CONFIG_SMP
26extern struct smp_ops smp_ops; 26extern struct smp_ops smp_ops;
27 27
28static inline void smp_send_stop(void)
29{
30 smp_ops.smp_send_stop();
31}
32
28static inline void smp_prepare_boot_cpu(void) 33static inline void smp_prepare_boot_cpu(void)
29{ 34{
30 smp_ops.smp_prepare_boot_cpu(); 35 smp_ops.smp_prepare_boot_cpu();
diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
index bc90a4ed3235..41b58e0bc75b 100644
--- a/include/asm-x86/smp_32.h
+++ b/include/asm-x86/smp_32.h
@@ -39,11 +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_send_stop(void)
43{
44 smp_ops.smp_send_stop();
45}
46
47#ifndef CONFIG_PARAVIRT 42#ifndef CONFIG_PARAVIRT
48#define startup_ipi_hook(phys_apicid, start_eip, start_esp) do { } while (0) 43#define startup_ipi_hook(phys_apicid, start_eip, start_esp) do { } while (0)
49#endif 44#endif