aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-03-03 12:13:01 -0500
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:40:56 -0400
commit1dbb4726faebe9e64a1e9cf40e3b39fffa065a65 (patch)
treeb475a21d9da5f55d3635028a8700d95425c79e5f /include
parent61d5989973cc52b0ef0f781e870dfe5da6d5023e (diff)
x86: move hotplug related extern definitions to smp.h
definitions that are inside CONFIG_HOTPLUG_CPU in the arch-specific smp*.h files are moved to common header 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.h6
-rw-r--r--include/asm-x86/smp_32.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index 1b4481aeb5c8..c800b815d378 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -80,6 +80,12 @@ extern void prefill_possible_map(void);
80# include "smp_64.h" 80# include "smp_64.h"
81#endif 81#endif
82 82
83#ifdef CONFIG_HOTPLUG_CPU
84extern void cpu_exit_clear(void);
85extern void cpu_uninit(void);
86extern void remove_siblinginfo(int cpu);
87#endif
88
83extern void smp_alloc_memory(void); 89extern void smp_alloc_memory(void);
84extern void lock_ipi_call_lock(void); 90extern void lock_ipi_call_lock(void);
85extern void unlock_ipi_call_lock(void); 91extern void unlock_ipi_call_lock(void);
diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
index 76247a947a5f..0b2513468870 100644
--- a/include/asm-x86/smp_32.h
+++ b/include/asm-x86/smp_32.h
@@ -29,12 +29,6 @@ DECLARE_PER_CPU(cpumask_t, cpu_core_map);
29DECLARE_PER_CPU(u16, cpu_llc_id); 29DECLARE_PER_CPU(u16, cpu_llc_id);
30DECLARE_PER_CPU(u16, x86_cpu_to_apicid); 30DECLARE_PER_CPU(u16, x86_cpu_to_apicid);
31 31
32#ifdef CONFIG_HOTPLUG_CPU
33extern void cpu_exit_clear(void);
34extern void cpu_uninit(void);
35extern void remove_siblinginfo(int cpu);
36#endif
37
38#ifdef CONFIG_SMP 32#ifdef CONFIG_SMP
39#ifndef CONFIG_PARAVIRT 33#ifndef CONFIG_PARAVIRT
40#define startup_ipi_hook(phys_apicid, start_eip, start_esp) do { } while (0) 34#define startup_ipi_hook(phys_apicid, start_eip, start_esp) do { } while (0)