diff options
author | 2011-10-20 16:07:27 +0200 | |
---|---|---|
committer | 2011-10-20 16:07:27 +0200 | |
commit | 97c24c1aa403e0d4ef7c1958db8459e488862b46 (patch) | |
tree | 15214db3c82fffcdbad1d0ef109c9c7558982ebb /arch/arm/mach-msm | |
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 | linux-97c24c1aa403e0d4ef7c1958db8459e488862b46.tar.gz linux-97c24c1aa403e0d4ef7c1958db8459e488862b46.tar.bz2 linux-97c24c1aa403e0d4ef7c1958db8459e488862b46.zip |
Merge branches 'cross-platform/debug_ll' and 'cross-platform/cpu-mapping' into next/cross-platform
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)); |