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-ux500 | |
| parent | f350b86121c7a004a5f866333fa1d23fe30263a6 (diff) | |
| parent | 4a139b64703115e41e1a4e16ebf7eb93d0a0e349 (diff) | |
Merge branches 'cross-platform/debug_ll' and 'cross-platform/cpu-mapping' into next/cross-platform
Diffstat (limited to 'arch/arm/mach-ux500')
| -rw-r--r-- | arch/arm/mach-ux500/hotplug.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/platsmp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/hotplug.c b/arch/arm/mach-ux500/hotplug.c index dd8037ebccf..572015e57cd 100644 --- a/arch/arm/mach-ux500/hotplug.c +++ b/arch/arm/mach-ux500/hotplug.c @@ -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 */ diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c index a33df5f4c27..27e5281cd55 100644 --- a/arch/arm/mach-ux500/platsmp.c +++ b/arch/arm/mach-ux500/platsmp.c @@ -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); |