diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 04:34:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 04:34:22 +0100 |
| commit | 6585dea1f99cc2265582ff2e4cc1727062136e92 (patch) | |
| tree | 57378ccfe0f9fde73081e1f9355d05dd4131e178 /arch/arm/mach-vexpress | |
| parent | Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc (diff) | |
| parent | Merge branches 'cross-platform/debug_ll' and 'cross-platform/cpu-mapping' int... (diff) | |
| download | linux-6585dea1f99cc2265582ff2e4cc1727062136e92.tar.xz linux-6585dea1f99cc2265582ff2e4cc1727062136e92.zip | |
Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc
* 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc:
arm/imx: use Kconfig choice for low-level debug UART selection
ARM: realview: use Kconfig choice for debug UART selection
ARM: plat-samsung: use Kconfig choice for debug UART selection
ARM: versatile: convert logical CPU numbers to physical numbers
ARM: ux500: convert logical CPU numbers to physical numbers
ARM: shmobile: convert logical CPU numbers to physical numbers
ARM: msm: convert logical CPU numbers to physical numbers
ARM: exynos4: convert logical CPU numbers to physical numbers
Fix up trivial conflict (config DEBUG_S3C_UART move/split vs addition of
ARM_KPROBES_TEST option) in arch/arm/Kconfig.debug
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 3668cf91d2de..813ee08f96e6 100644 --- a/arch/arm/mach-vexpress/hotplug.c +++ b/arch/arm/mach-vexpress/hotplug.c @@ -65,7 +65,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious) for (;;) { wfi(); - if (pen_release == cpu) { + if (pen_release == cpu_logical_map(cpu)) { /* * OK, proper wakeup, we're done */ |