diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 10:07:27 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 10:07:27 -0400 |
| commit | 97c24c1aa403e0d4ef7c1958db8459e488862b46 (patch) | |
| tree | 15214db3c82fffcdbad1d0ef109c9c7558982ebb /arch/arm/plat-versatile/platsmp.c | |
| 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/plat-versatile/platsmp.c')
| -rw-r--r-- | arch/arm/plat-versatile/platsmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-versatile/platsmp.c b/arch/arm/plat-versatile/platsmp.c index 51ecfea09b27..92f18d372b69 100644 --- a/arch/arm/plat-versatile/platsmp.c +++ b/arch/arm/plat-versatile/platsmp.c | |||
| @@ -77,7 +77,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) | |||
| 77 | * since we haven't sent them a soft interrupt, they shouldn't | 77 | * since we haven't sent them a soft interrupt, they shouldn't |
| 78 | * be there. | 78 | * be there. |
| 79 | */ | 79 | */ |
| 80 | write_pen_release(cpu); | 80 | write_pen_release(cpu_logical_map(cpu)); |
| 81 | 81 | ||
| 82 | /* | 82 | /* |
| 83 | * Send the secondary CPU a soft interrupt, thereby causing | 83 | * Send the secondary CPU a soft interrupt, thereby causing |