From e5ec5fc4984efaa42105f39920ccb57136ce7751 Mon Sep 17 00:00:00 2001
From: Liviu Dudau <Liviu.Dudau@arm.com>
Date: Tue, 26 Mar 2013 11:02:51 +0000
Subject: [PATCH] --- yaml --- r: 367244 b: refs/heads/master c:
 a9a193ffe51d036a7c2d30d7fbdb66498c688237 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm64/kernel/smp_psci.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b7dd5aa5fcec..07557f197a7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0359b0e2d0bbd28289c38ebe779b5f1c61f8ccc8
+refs/heads/master: a9a193ffe51d036a7c2d30d7fbdb66498c688237
diff --git a/trunk/arch/arm64/kernel/smp_psci.c b/trunk/arch/arm64/kernel/smp_psci.c
index 112091684c22..0c533301be77 100644
--- a/trunk/arch/arm64/kernel/smp_psci.c
+++ b/trunk/arch/arm64/kernel/smp_psci.c
@@ -21,6 +21,7 @@
 #include <linux/smp.h>
 
 #include <asm/psci.h>
+#include <asm/smp_plat.h>
 
 static int __init smp_psci_init_cpu(struct device_node *dn, int cpu)
 {
@@ -36,7 +37,7 @@ static int __init smp_psci_prepare_cpu(int cpu)
 		return -ENODEV;
 	}
 
-	err = psci_ops.cpu_on(cpu, __pa(secondary_holding_pen));
+	err = psci_ops.cpu_on(cpu_logical_map(cpu), __pa(secondary_holding_pen));
 	if (err) {
 		pr_err("psci: failed to boot CPU%d (%d)\n", cpu, err);
 		return err;
@@ -47,6 +48,6 @@ static int __init smp_psci_prepare_cpu(int cpu)
 
 const struct smp_enable_ops smp_psci_ops __initconst = {
 	.name		= "psci",
-	.init_cpu 	= smp_psci_init_cpu,
+	.init_cpu	= smp_psci_init_cpu,
 	.prepare_cpu	= smp_psci_prepare_cpu,
 };