From 26c06a65476d949f79f02189ced959cf65942190 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 18 Dec 2010 12:34:39 +0000
Subject: [PATCH] --- yaml --- r: 225891 b: refs/heads/master c:
 58613cd1d4f8c2d5f25b6c57ad7fbed80e75a67b h: refs/heads/master i:   225889:
 604deb97fc45d4f7a06898d278bde783d53b262e   225887:
 e5b463ea02709d736f53bb0939c15a8e718469ac v: v3

---
 [refs]                      |  2 +-
 trunk/arch/arm/kernel/smp.c | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index a1808a919c4d..f55b48713c52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90b44199e83ec780d6def11a602d825dc68438e3
+refs/heads/master: 58613cd1d4f8c2d5f25b6c57ad7fbed80e75a67b
diff --git a/trunk/arch/arm/kernel/smp.c b/trunk/arch/arm/kernel/smp.c
index 1a1c5e2b3ef9..6afaf6f73069 100644
--- a/trunk/arch/arm/kernel/smp.c
+++ b/trunk/arch/arm/kernel/smp.c
@@ -164,8 +164,12 @@ int __cpuinit __cpu_up(unsigned int cpu)
 			barrier();
 		}
 
-		if (!cpu_online(cpu))
+		if (!cpu_online(cpu)) {
+			pr_crit("CPU%u: failed to come online\n", cpu);
 			ret = -EIO;
+		}
+	} else {
+		pr_err("CPU%u: failed to boot: %d\n", cpu, ret);
 	}
 
 	secondary_data.stack = NULL;
@@ -181,14 +185,6 @@ int __cpuinit __cpu_up(unsigned int cpu)
 
 	pgd_free(&init_mm, pgd);
 
-	if (ret) {
-		printk(KERN_CRIT "CPU%u: processor failed to boot\n", cpu);
-
-		/*
-		 * FIXME: We need to clean up the new idle thread. --rmk
-		 */
-	}
-
 	return ret;
 }