From: Chuck Ebbert 
revert: x86: move prefill_possible_map calling early, fix
revert 4a7017370aa0a94a00ae5b5705e9169cdcae5fb8
This is the wrong fix: prefill_possible_map() needs to be available

even when CONFIG_HOTPLUG_CPU is not set. A followon patch will do that.
Signed-off-by: Chuck Ebbert 
---
--- b/include/asm-x86/smp.h

+++ a/include/asm-x86/smp.h

@@ -116,6 +116,8 @@

 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,15 +126,11 @@

 {

 	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;
--

unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

the body of a message to majordomo@vger.kernel.org

More majordomo info at  http://vger.kernel.org/majordomo-info.html

Please read the FAQ at  http://www.tux.org/lkml/