diff options
| author | Will Deacon <will.deacon@arm.com> | 2011-08-09 12:21:36 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2011-10-17 10:01:11 +0100 |
| commit | 28763487b19eacca70374c1f62b3b8da2bba464f (patch) | |
| tree | 6766d7b463e51c67dc446ff1f0462e338c8116c7 /arch/arm | |
| parent | f80ca52cab8f999246ed2e4daa90eb40cb810822 (diff) | |
ARM: ux500: convert logical CPU numbers to physical numbers
This patch uses the new cpu_logical_map() macro for converting logical
CPU numbers into physical numbers when dealing with the pen_release
variable in the SMP boot and CPU hotplug paths.
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-ux500/hotplug.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/platsmp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/hotplug.c b/arch/arm/mach-ux500/hotplug.c index dd8037ebccf..572015e57cd 100644 --- a/arch/arm/mach-ux500/hotplug.c +++ b/arch/arm/mach-ux500/hotplug.c @@ -24,7 +24,7 @@ static inline void platform_do_lowpower(unsigned int cpu) for (;;) { __asm__ __volatile__("dsb\n\t" "wfi\n\t" : : : "memory"); - if (pen_release == cpu) { + if (pen_release == cpu_logical_map(cpu)) { /* * OK, proper wakeup, we're done */ diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c index a33df5f4c27..27e5281cd55 100644 --- a/arch/arm/mach-ux500/platsmp.c +++ b/arch/arm/mach-ux500/platsmp.c @@ -96,7 +96,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) * the holding pen - release it, then wait for it to flag * that it has been released by resetting pen_release. */ - write_pen_release(cpu); + write_pen_release(cpu_logical_map(cpu)); gic_raise_softirq(cpumask_of(cpu), 1); |