Pull altix-mmr into release branch

[powerpc.git] / include / asm-arm / smp.h

diff --git a/include/asm-arm/smp.h b/include/asm-arm/smp.h
index f21fd8f..dbb4d85 100644 (file)
--- a/include/asm-arm/smp.h
+++ b/include/asm-arm/smp.h
@@ -21,10 +21,7 @@
 # error "<asm-arm/smp.h> included in non-SMP build"
 #endif
 
-#define smp_processor_id()     (current_thread_info()->cpu)
-
-extern cpumask_t cpu_present_mask;
-#define cpu_possible_map cpu_present_mask
+#define raw_smp_processor_id() (current_thread_info()->cpu)
 
 /*
  * at the moment, there's not a big penalty for changing CPUs
@@ -55,4 +52,18 @@ extern void smp_cross_call(cpumask_t callmap);
  */
 extern int boot_secondary(unsigned int cpu, struct task_struct *);
 
+/*
+ * Perform platform specific initialisation of the specified CPU.
+ */
+extern void platform_secondary_init(unsigned int cpu);
+
+/*
+ * Initial data for bringing up a secondary CPU.
+ */
+struct secondary_data {
+       unsigned long pgdir;
+       void *stack;
+};
+extern struct secondary_data secondary_data;
+
 #endif /* ifndef __ASM_ARM_SMP_H */