diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 23:34:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 23:34:22 -0400 |
commit | 6585dea1f99cc2265582ff2e4cc1727062136e92 (patch) | |
tree | 57378ccfe0f9fde73081e1f9355d05dd4131e178 /arch/arm/mach-msm | |
parent | 16ee792e45cf0c97ce061fce03c36cab5551ec72 (diff) | |
parent | 97c24c1aa403e0d4ef7c1958db8459e488862b46 (diff) |
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-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 5a31f70dfb8..41c252de021 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) | |||
37 | : | 37 | : |
38 | : "memory", "cc"); | 38 | : "memory", "cc"); |
39 | 39 | ||
40 | if (pen_release == cpu) { | 40 | if (pen_release == cpu_logical_map(cpu)) { |
41 | /* | 41 | /* |
42 | * OK, proper wakeup, we're done | 42 | * OK, proper wakeup, we're done |
43 | */ | 43 | */ |
diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c index 72765952091..fdec58aaa35 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) | |||
117 | * Note that "pen_release" is the hardware CPU ID, whereas | 117 | * Note that "pen_release" is the hardware CPU ID, whereas |
118 | * "cpu" is Linux's internal ID. | 118 | * "cpu" is Linux's internal ID. |
119 | */ | 119 | */ |
120 | pen_release = cpu; | 120 | pen_release = cpu_logical_map(cpu); |
121 | __cpuc_flush_dcache_area((void *)&pen_release, sizeof(pen_release)); | 121 | __cpuc_flush_dcache_area((void *)&pen_release, sizeof(pen_release)); |
122 | outer_clean_range(__pa(&pen_release), __pa(&pen_release + 1)); | 122 | outer_clean_range(__pa(&pen_release), __pa(&pen_release + 1)); |
123 | 123 | ||