summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-realview
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-20 16:07:27 +0200
committerArnd Bergmann <arnd@arndb.de>2011-10-20 16:07:27 +0200
commit97c24c1aa403e0d4ef7c1958db8459e488862b46 (patch)
tree15214db3c82fffcdbad1d0ef109c9c7558982ebb /arch/arm/mach-realview
parentf350b86121c7a004a5f866333fa1d23fe30263a6 (diff)
parent4a139b64703115e41e1a4e16ebf7eb93d0a0e349 (diff)
downloadop-kernel-dev-97c24c1aa403e0d4ef7c1958db8459e488862b46.zip
op-kernel-dev-97c24c1aa403e0d4ef7c1958db8459e488862b46.tar.gz
Merge branches 'cross-platform/debug_ll' and 'cross-platform/cpu-mapping' into next/cross-platform
Diffstat (limited to 'arch/arm/mach-realview')
-rw-r--r--arch/arm/mach-realview/hotplug.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-realview/hotplug.c b/arch/arm/mach-realview/hotplug.c
index a87523d..ac1aed2 100644
--- a/arch/arm/mach-realview/hotplug.c
+++ b/arch/arm/mach-realview/hotplug.c
@@ -69,7 +69,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
:
: "memory", "cc");
- if (pen_release == cpu) {
+ if (pen_release == cpu_logical_map(cpu)) {
/*
* OK, proper wakeup, we're done
*/
OpenPOWER on IntegriCloud