From 9ba5434a791e66b1019586eb93829ca86cbc16c5 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Tue, 9 Aug 2011 12:21:36 +0100
Subject: [PATCH] --- yaml --- r: 272885 b: refs/heads/master c:
 28763487b19eacca70374c1f62b3b8da2bba464f h: refs/heads/master i:   272883:
 2b935da9f99e56e3250bb5fd1a2d4fae22410e20 v: v3

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

diff --git a/[refs] b/[refs]
index 7676e766ec96..a01dbffd3521 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f80ca52cab8f999246ed2e4daa90eb40cb810822
+refs/heads/master: 28763487b19eacca70374c1f62b3b8da2bba464f
diff --git a/trunk/arch/arm/mach-ux500/hotplug.c b/trunk/arch/arm/mach-ux500/hotplug.c
index dd8037ebccf8..572015e57cd9 100644
--- a/trunk/arch/arm/mach-ux500/hotplug.c
+++ b/trunk/arch/arm/mach-ux500/hotplug.c
@@ -24,7 +24,7 @@ static inline void platform_do_lowpower(unsigned int cpu)
 	for (;;) {
 		__asm__ __volatile__("dsb\n\t" "wfi\n\t"
 				: : : "memory");
-		if (pen_release == cpu) {
+		if (pen_release == cpu_logical_map(cpu)) {
 			/*
 			 * OK, proper wakeup, we're done
 			 */
diff --git a/trunk/arch/arm/mach-ux500/platsmp.c b/trunk/arch/arm/mach-ux500/platsmp.c
index a33df5f4c27a..27e5281cd55d 100644
--- a/trunk/arch/arm/mach-ux500/platsmp.c
+++ b/trunk/arch/arm/mach-ux500/platsmp.c
@@ -96,7 +96,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
 	 * the holding pen - release it, then wait for it to flag
 	 * that it has been released by resetting pen_release.
 	 */
-	write_pen_release(cpu);
+	write_pen_release(cpu_logical_map(cpu));
 
 	gic_raise_softirq(cpumask_of(cpu), 1);