From 252fb7fcf4c970b0543f147661c3c03b15455710 Mon Sep 17 00:00:00 2001
From: Rob Herring <rob.herring@calxeda.com>
Date: Thu, 31 Jan 2013 13:26:29 -0600
Subject: [PATCH] --- yaml --- r: 349706 b: refs/heads/master c:
 c7d5b93e9834f0e6cf21828a6fbf45ac440cf364 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index aef508dcf1ce..9452ac49fd18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eed8812387e201e158059fe6fb908f8a662084dd
+refs/heads/master: c7d5b93e9834f0e6cf21828a6fbf45ac440cf364
diff --git a/trunk/arch/arm/kernel/smp_scu.c b/trunk/arch/arm/kernel/smp_scu.c
index b9f015e843d8..45eac87ed66a 100644
--- a/trunk/arch/arm/kernel/smp_scu.c
+++ b/trunk/arch/arm/kernel/smp_scu.c
@@ -75,7 +75,7 @@ void scu_enable(void __iomem *scu_base)
 int scu_power_mode(void __iomem *scu_base, unsigned int mode)
 {
 	unsigned int val;
-	int cpu = cpu_logical_map(smp_processor_id());
+	int cpu = MPIDR_AFFINITY_LEVEL(cpu_logical_map(smp_processor_id()), 0);
 
 	if (mode > 3 || mode == 1 || cpu > 3)
 		return -EINVAL;