Merge branch 'topic/lola' into for-linus

[linux.git] / include / linux / smp.h

diff --git a/include/linux/smp.h b/include/linux/smp.h
index 6dc95cac6b3dabc390ac271cca9a0e4fb16436ac..74243c86ba39fd475c3188083f95d0f367133498 100644 (file)
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -10,6 +10,7 @@
 #include <linux/types.h>
 #include <linux/list.h>
 #include <linux/cpumask.h>
+#include <linux/init.h>
 
 extern void cpu_idle(void);
 
@@ -114,6 +115,8 @@ int on_each_cpu(smp_call_func_t func, void *info, int wait);
 void smp_prepare_boot_cpu(void);
 
 extern unsigned int setup_max_cpus;
+extern void __init setup_nr_cpu_ids(void);
+extern void __init smp_init(void);
 
 #else /* !SMP */