aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/asm-x86/smp.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index b324a0645a78..2e221f1ce0b2 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -109,8 +109,6 @@ int native_cpu_up(unsigned int cpunum);
109extern int __cpu_disable(void); 109extern int __cpu_disable(void);
110extern void __cpu_die(unsigned int cpu); 110extern void __cpu_die(unsigned int cpu);
111 111
112extern void prefill_possible_map(void);
113
114void smp_store_cpu_info(int id); 112void smp_store_cpu_info(int id);
115#define cpu_physical_id(cpu) per_cpu(x86_cpu_to_apicid, cpu) 113#define cpu_physical_id(cpu) per_cpu(x86_cpu_to_apicid, cpu)
116 114
@@ -119,11 +117,15 @@ static inline int num_booting_cpus(void)
119{ 117{
120 return cpus_weight(cpu_callout_map); 118 return cpus_weight(cpu_callout_map);
121} 119}
120#endif /* CONFIG_SMP */
121
122#if defined(CONFIG_SMP) && defined(CONFIG_HOTPLUG_CPU)
123extern void prefill_possible_map(void);
122#else 124#else
123static inline void prefill_possible_map(void) 125static inline void prefill_possible_map(void)
124{ 126{
125} 127}
126#endif /* CONFIG_SMP */ 128#endif
127 129
128extern unsigned disabled_cpus __cpuinitdata; 130extern unsigned disabled_cpus __cpuinitdata;
129 131