diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 16:07:27 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 16:07:27 +0200 |
| commit | 97c24c1aa403e0d4ef7c1958db8459e488862b46 (patch) | |
| tree | 15214db3c82fffcdbad1d0ef109c9c7558982ebb /arch/arm/mach-exynos4/platsmp.c | |
| 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.xz linux-97c24c1aa403e0d4ef7c1958db8459e488862b46.zip | |
Merge branches 'cross-platform/debug_ll' and 'cross-platform/cpu-mapping' into next/cross-platform
Diffstat (limited to 'arch/arm/mach-exynos4/platsmp.c')
| -rw-r--r-- | arch/arm/mach-exynos4/platsmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos4/platsmp.c b/arch/arm/mach-exynos4/platsmp.c index 7c2282c6ba81..073381469c9d 100644 --- a/arch/arm/mach-exynos4/platsmp.c +++ b/arch/arm/mach-exynos4/platsmp.c @@ -126,7 +126,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. */ - write_pen_release(cpu); + write_pen_release(cpu_logical_map(cpu)); if (!(__raw_readl(S5P_ARM_CORE1_STATUS) & S5P_CORE_LOCAL_PWR_EN)) { __raw_writel(S5P_CORE_LOCAL_PWR_EN, |