Skip to content

Commit

Permalink
ARM: ux500: convert logical CPU numbers to physical numbers
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Will Deacon committed Oct 17, 2011
1 parent f80ca52 commit 2876348
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-ux500/hotplug.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-ux500/platsmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 2876348

Please sign in to comment.