From ed8af9f7df5b4a19eb4d52f288f29bf11a858964 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 13 Jan 2010 20:44:34 +0100
Subject: [PATCH] --- yaml --- r: 179278 b: refs/heads/master c:
 02beaccc901b7a28ac1de79f3ed122f5fda220b1 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/s390/kernel/setup.c | 1 -
 trunk/arch/s390/kernel/smp.c   | 6 ++++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4d19727ebf03..a01a5c2ef4dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a58c26bba9ebe97fea99aee125728b1f3886499e
+refs/heads/master: 02beaccc901b7a28ac1de79f3ed122f5fda220b1
diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c
index 2148ad3d490d..2d6a265b0145 100644
--- a/trunk/arch/s390/kernel/setup.c
+++ b/trunk/arch/s390/kernel/setup.c
@@ -849,7 +849,6 @@ setup_arch(char **cmdline_p)
 	setup_lowcore();
 
         cpu_init();
-	__cpu_logical_map[0] = stap();
 	s390_init_cpu_topology();
 
 	/*
diff --git a/trunk/arch/s390/kernel/smp.c b/trunk/arch/s390/kernel/smp.c
index 93e52039321b..eebce7fdc97c 100644
--- a/trunk/arch/s390/kernel/smp.c
+++ b/trunk/arch/s390/kernel/smp.c
@@ -717,6 +717,12 @@ void __init smp_cpus_done(unsigned int max_cpus)
 {
 }
 
+void __init smp_setup_processor_id(void)
+{
+	S390_lowcore.cpu_nr = 0;
+	__cpu_logical_map[0] = stap();
+}
+
 /*
  * the frequency of the profiling timer can be changed
  * by writing a multiplier value into /proc/profile.