From 2b935da9f99e56e3250bb5fd1a2d4fae22410e20 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Tue, 9 Aug 2011 12:02:27 +0100
Subject: [PATCH] --- yaml --- r: 272883 b: refs/heads/master c:
 1d3cfb34f9605578b4f733acba4affa751b2e4a2 h: refs/heads/master i:   272881:
 84db5c337fb2565582e4af68166978a93fa71256   272879:
 d297469db1c3656b1d9423b428c6402c53565f59 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/mach-msm/hotplug.c | 2 +-
 trunk/arch/arm/mach-msm/platsmp.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6bd0917615c6..8d94fabb09e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f41c36b07af71bb308ff8f1739481b022476080
+refs/heads/master: 1d3cfb34f9605578b4f733acba4affa751b2e4a2
diff --git a/trunk/arch/arm/mach-msm/hotplug.c b/trunk/arch/arm/mach-msm/hotplug.c
index 5a31f70dfb8e..41c252de0215 100644
--- a/trunk/arch/arm/mach-msm/hotplug.c
+++ b/trunk/arch/arm/mach-msm/hotplug.c
@@ -37,7 +37,7 @@ static inline void platform_do_lowpower(unsigned int cpu)
 		    :
 		    : "memory", "cc");
 
-		if (pen_release == cpu) {
+		if (pen_release == cpu_logical_map(cpu)) {
 			/*
 			 * OK, proper wakeup, we're done
 			 */
diff --git a/trunk/arch/arm/mach-msm/platsmp.c b/trunk/arch/arm/mach-msm/platsmp.c
index 1a1af9e56250..e3375ee7841e 100644
--- a/trunk/arch/arm/mach-msm/platsmp.c
+++ b/trunk/arch/arm/mach-msm/platsmp.c
@@ -117,7 +117,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
 	 * Note that "pen_release" is the hardware CPU ID, whereas
 	 * "cpu" is Linux's internal ID.
 	 */
-	pen_release = cpu;
+	pen_release = cpu_logical_map(cpu);
 	__cpuc_flush_dcache_area((void *)&pen_release, sizeof(pen_release));
 	outer_clean_range(__pa(&pen_release), __pa(&pen_release + 1));