diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 16:07:27 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 16:07:27 +0200 |
| commit | 97c24c1aa403e0d4ef7c1958db8459e488862b46 (patch) | |
| tree | 15214db3c82fffcdbad1d0ef109c9c7558982ebb /arch/arm/mach-vexpress | |
| parent | f350b86121c7a004a5f866333fa1d23fe30263a6 (diff) | |
| parent | 4a139b64703115e41e1a4e16ebf7eb93d0a0e349 (diff) | |
| download | blackbird-op-linux-97c24c1aa403e0d4ef7c1958db8459e488862b46.tar.gz blackbird-op-linux-97c24c1aa403e0d4ef7c1958db8459e488862b46.zip | |
Merge branches 'cross-platform/debug_ll' and 'cross-platform/cpu-mapping' into next/cross-platform
Diffstat (limited to 'arch/arm/mach-vexpress')
| -rw-r--r-- | arch/arm/mach-vexpress/hotplug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/hotplug.c b/arch/arm/mach-vexpress/hotplug.c index ea4cbfb90a66..2866ed8c4b05 100644 --- a/arch/arm/mach-vexpress/hotplug.c +++ b/arch/arm/mach-vexpress/hotplug.c @@ -70,7 +70,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 */ |
