From 67f5d3358f01a73a984b1afbdd508a1ea47a2694 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 14 Apr 2009 15:36:25 +0200
Subject: [PATCH] --- yaml --- r: 143394 b: refs/heads/master c:
 88e012856d05a5d00ae80c691fb7aa5adda268d7 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 271a7f171fbb..419ede87f3d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52db45c3c55a0fca53077dfd7b123e30cd210aad
+refs/heads/master: 88e012856d05a5d00ae80c691fb7aa5adda268d7
diff --git a/trunk/arch/s390/kernel/smp.c b/trunk/arch/s390/kernel/smp.c
index 796630240715..a985a3ba4401 100644
--- a/trunk/arch/s390/kernel/smp.c
+++ b/trunk/arch/s390/kernel/smp.c
@@ -591,7 +591,8 @@ static int __init setup_possible_cpus(char *s)
 	int pcpus, cpu;
 
 	pcpus = simple_strtoul(s, NULL, 0);
-	for (cpu = 0; cpu < pcpus && cpu < nr_cpu_ids; cpu++)
+	init_cpu_possible(cpumask_of(0));
+	for (cpu = 1; cpu < pcpus && cpu < nr_cpu_ids; cpu++)
 		set_cpu_possible(cpu, true);
 	return 0;
 }