From af05f21b63c69c076df7f45751894bd17ac076a7 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Fri, 30 Jun 2006 01:55:50 -0700
Subject: [PATCH] --- yaml --- r: 31392 b: refs/heads/master c:
 033ab7f8e5c655f49ec8039930b2efd412abbbd7 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/i386/mach-voyager/voyager_smp.c | 6 ++++++
 trunk/include/linux/smp.h                  | 2 ++
 trunk/init/main.c                          | 7 +++++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e5fc5c4984ac..32471778aaf9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1836a42daf5ddfe9a891973734bd9a7d62eb504
+refs/heads/master: 033ab7f8e5c655f49ec8039930b2efd412abbbd7
diff --git a/trunk/arch/i386/mach-voyager/voyager_smp.c b/trunk/arch/i386/mach-voyager/voyager_smp.c
index 5b8b579a079f..6e9e494c6c3d 100644
--- a/trunk/arch/i386/mach-voyager/voyager_smp.c
+++ b/trunk/arch/i386/mach-voyager/voyager_smp.c
@@ -1938,3 +1938,9 @@ smp_cpus_done(unsigned int max_cpus)
 {
 	zap_low_mappings();
 }
+
+void __init
+smp_setup_processor_id(void)
+{
+	current_thread_info()->cpu = hard_smp_processor_id();
+}
diff --git a/trunk/include/linux/smp.h b/trunk/include/linux/smp.h
index c93c3fe4308c..837e8bce1349 100644
--- a/trunk/include/linux/smp.h
+++ b/trunk/include/linux/smp.h
@@ -125,4 +125,6 @@ static inline void smp_send_reschedule(int cpu) { }
 #define put_cpu()		preempt_enable()
 #define put_cpu_no_resched()	preempt_enable_no_resched()
 
+void smp_setup_processor_id(void);
+
 #endif /* __LINUX_SMP_H */
diff --git a/trunk/init/main.c b/trunk/init/main.c
index bce0eb7f4f8f..ae04eb78a93a 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -446,10 +446,17 @@ static void __init boot_cpu_init(void)
 	cpu_set(cpu, cpu_possible_map);
 }
 
+void __init __attribute__((weak)) smp_setup_processor_id(void)
+{
+}
+
 asmlinkage void __init start_kernel(void)
 {
 	char * command_line;
 	extern struct kernel_param __start___param[], __stop___param[];
+
+	smp_setup_processor_id();
+
 /*
  * Interrupts are still disabled. Do necessary setups, then
  * enable them