Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6] / include / asm-ppc / smp.h

diff --git a/include/asm-ppc/smp.h b/include/asm-ppc/smp.h
index 79c1be3dfe619550e5a13b838a5d3bbe877551fe..30e9268a888c4664f441586630dc1ecf682102cd 100644 (file)
--- a/include/asm-ppc/smp.h
+++ b/include/asm-ppc/smp.h
@@ -35,6 +35,7 @@ extern cpumask_t cpu_possible_map;
 extern unsigned long smp_proc_in_lock[];
 extern volatile unsigned long cpu_callin_map[];
 extern int smp_tb_synchronized;
+extern struct smp_ops_t *smp_ops;
 
 extern void smp_send_tlb_invalidate(int);
 extern void smp_send_xmon_break(int cpu);
@@ -52,16 +53,24 @@ extern int __cpu_up(unsigned int cpu);
 extern int smp_hw_index[];
 #define hard_smp_processor_id()        (smp_hw_index[smp_processor_id()])
 #define get_hard_smp_processor_id(cpu) (smp_hw_index[(cpu)])
-
+#define set_hard_smp_processor_id(cpu, phys)\
+                                       (smp_hw_index[(cpu)] = (phys))
+ 
 #endif /* __ASSEMBLY__ */
 
 #else /* !(CONFIG_SMP) */
 
 static inline void cpu_die(void) { }
 #define get_hard_smp_processor_id(cpu) 0
+#define set_hard_smp_processor_id(cpu, phys)
 #define hard_smp_processor_id() 0
 
 #endif /* !(CONFIG_SMP) */
 
+#ifndef __ASSEMBLY__
+extern int boot_cpuid;
+extern int boot_cpuid_phys;
+#endif
+
 #endif /* !(_PPC_SMP_H) */
 #endif /* __KERNEL__ */