diff options
| author | Will Deacon <will.deacon@arm.com> | 2011-08-09 12:02:27 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2011-10-17 10:01:11 +0100 |
| commit | 1d3cfb34f9605578b4f733acba4affa751b2e4a2 (patch) | |
| tree | f4a0fe4999b0741f158f9732ab859c1b31085b30 /arch/arm/mach-msm | |
| parent | 2f41c36b07af71bb308ff8f1739481b022476080 (diff) | |
| download | blackbird-op-linux-1d3cfb34f9605578b4f733acba4affa751b2e4a2.tar.gz blackbird-op-linux-1d3cfb34f9605578b4f733acba4affa751b2e4a2.zip | |
ARM: msm: 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.
Tested-and-acked-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm/mach-msm')
| -rw-r--r-- | arch/arm/mach-msm/hotplug.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-msm/platsmp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c index 5a31f70dfb8e..41c252de0215 100644 --- a/arch/arm/mach-msm/hotplug.c +++ b/arch/arm/mach-msm/hotplug.c @@ -37,7 +37,7 @@ static inline void platform_do_lowpower(unsigned int cpu) : : "memory", "cc"); - if (pen_release == cpu) { + if (pen_release == cpu_logical_map(cpu)) { /* * OK, proper wakeup, we're done */ diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c index 1a1af9e56250..e3375ee7841e 100644 --- a/arch/arm/mach-msm/platsmp.c +++ b/arch/arm/mach-msm/platsmp.c @@ -117,7 +117,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) * Note that "pen_release" is the hardware CPU ID, whereas * "cpu" is Linux's internal ID. */ - pen_release = cpu; + pen_release = cpu_logical_map(cpu); __cpuc_flush_dcache_area((void *)&pen_release, sizeof(pen_release)); outer_clean_range(__pa(&pen_release), __pa(&pen_release + 1)); |
