Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / include / asm-mips / smp.h

diff --git a/include/asm-mips/smp.h b/include/asm-mips/smp.h
index ffcb7a336b173a5eab6f151ddd90d6656d908917..1608fd71d6f7ffd7d1e1a39cf181515c658c3ea4 100644 (file)
--- a/include/asm-mips/smp.h
+++ b/include/asm-mips/smp.h
@@ -47,7 +47,6 @@ extern struct call_data_struct *call_data;
 #define SMP_CALL_FUNCTION      0x2
 
 extern cpumask_t phys_cpu_present_map;
-extern cpumask_t cpu_online_map;
 #define cpu_possible_map       phys_cpu_present_map
 
 extern cpumask_t cpu_callout_map;
@@ -85,9 +84,9 @@ extern void prom_init_secondary(void);
 extern void plat_smp_setup(void);
 
 /*
- * Called after init_IRQ but before __cpu_up.
+ * Called in smp_prepare_cpus.
  */
-extern void prom_prepare_cpus(unsigned int max_cpus);
+extern void plat_prepare_cpus(unsigned int max_cpus);
 
 /*
  * Last chance for the board code to finish SMP initialization before