diff options
| author | Arnd Bergmann | 2011-10-20 16:07:27 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2011-10-20 16:07:27 +0200 |
| commit | 97c24c1aa403e0d4ef7c1958db8459e488862b46 (patch) | |
| tree | 15214db3c82fffcdbad1d0ef109c9c7558982ebb /arch/arm/mach-realview | |
| parent | arm/imx: use Kconfig choice for low-level debug UART selection (diff) | |
| parent | ARM: versatile: convert logical CPU numbers to physical numbers (diff) | |
| download | kernel-qcow2-linux-97c24c1aa403e0d4ef7c1958db8459e488862b46.tar.gz kernel-qcow2-linux-97c24c1aa403e0d4ef7c1958db8459e488862b46.tar.xz kernel-qcow2-linux-97c24c1aa403e0d4ef7c1958db8459e488862b46.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-realview/hotplug.c b/arch/arm/mach-realview/hotplug.c index a87523d095e6..ac1aed2a8da4 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 */ |