Messages in this thread Patch in this message | | | Date | Thu, 3 Jul 2008 16:03:11 +0200 | From | Ingo Molnar <> | Subject | Re: [PATCH] x86: move prefill_possible_map calling early |
| |
FYI, this one needed the small fixlet below. (prefill_possible_map() is dependent on both CONFIG_SMP and CONFIG_HOTPLUG_CPU - not just CONFIG_SMP)
Ingo
--------------> commit bb42b7bdee9decad536c1e747e2ce2f3daebb76f Author: Ingo Molnar <mingo@elte.hu> Date: Thu Jul 3 15:57:47 2008 +0200
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>
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h index bf6b5ee..c2784b3 100644 --- a/include/asm-x86/smp.h +++ b/include/asm-x86/smp.h @@ -114,8 +114,6 @@ void native_send_call_func_single_ipi(int cpu); 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) @@ -124,11 +122,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;
| |