diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-03 15:57:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 13:16:25 +0200 |
| commit | 4a7017370aa0a94a00ae5b5705e9169cdcae5fb8 (patch) | |
| tree | 125e38c82c2279e860ced4985c7aeaa97e3e95c2 | |
| parent | 329513a35d1a2b6b28d54f5c2c0dde4face8200b (diff) | |
x86: move prefill_possible_map calling early, fix
fix:
arch/x86/kernel/built-in.o: In function `setup_arch':
: undefined reference to `prefill_possible_map'
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | include/asm-x86/smp.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h index b324a0645a7..2e221f1ce0b 100644 --- a/include/asm-x86/smp.h +++ b/include/asm-x86/smp.h @@ -109,8 +109,6 @@ int native_cpu_up(unsigned int cpunum); extern int __cpu_disable(void); extern void __cpu_die(unsigned int cpu); -extern void prefill_possible_map(void); - void smp_store_cpu_info(int id); #define cpu_physical_id(cpu) per_cpu(x86_cpu_to_apicid, cpu) @@ -119,11 +117,15 @@ static inline int num_booting_cpus(void) { return cpus_weight(cpu_callout_map); } +#endif /* CONFIG_SMP */ + +#if defined(CONFIG_SMP) && defined(CONFIG_HOTPLUG_CPU) +extern void prefill_possible_map(void); #else static inline void prefill_possible_map(void) { } -#endif /* CONFIG_SMP */ +#endif extern unsigned disabled_cpus __cpuinitdata; |