X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=arch%2Fx86%2Finclude%2Fasm%2Fcpu.h;h=b185091bf19ce39f67a325ecd6aafb7c13f8cd23;hb=ab46feae865c5b96dbf5e261be8638165932bfb1;hp=83a115083f0d74ad3eb0f82eae64e19aea5a7cc1;hpb=bb8985586b7a906e116db835c64773b7a7d51663;p=safe%2Fjmp%2Flinux-2.6

diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h
index 83a1150..b185091 100644
--- a/arch/x86/include/asm/cpu.h
+++ b/arch/x86/include/asm/cpu.h
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__CPU_H
-#define ASM_X86__CPU_H
+#ifndef _ASM_X86_CPU_H
+#define _ASM_X86_CPU_H
 
 #include <linux/device.h>
 #include <linux/cpu.h>
@@ -7,6 +7,20 @@
 #include <linux/nodemask.h>
 #include <linux/percpu.h>
 
+#ifdef CONFIG_SMP
+
+extern void prefill_possible_map(void);
+
+#else /* CONFIG_SMP */
+
+static inline void prefill_possible_map(void) {}
+
+#define cpu_physical_id(cpu)			boot_cpu_physical_apicid
+#define safe_smp_processor_id()			0
+#define stack_smp_processor_id()		0
+
+#endif /* CONFIG_SMP */
+
 struct x86_cpu {
 	struct cpu cpu;
 };
@@ -17,4 +31,7 @@ extern void arch_unregister_cpu(int);
 #endif
 
 DECLARE_PER_CPU(int, cpu_state);
-#endif /* ASM_X86__CPU_H */
+
+extern unsigned int boot_cpu_id;
+
+#endif /* _ASM_X86_CPU_H */