diff options
| author | Will Deacon <will.deacon@arm.com> | 2012-11-07 12:00:05 -0500 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-11-08 11:06:21 -0500 |
| commit | b3770b3252589240e50f560197a19531979abba2 (patch) | |
| tree | 19d41ca9a8c8ea9b10a9e40ccd53faecb13d5a32 /arch/arm64 | |
| parent | 6212a512240f48d84090bc42a24d6dfb033754bc (diff) | |
arm64: smp: add missing completion for secondary boot
Commit 149c24151e85 ("ARM: SMP: use a timing out completion for cpu
hotplug") modified arm's CPU up path to use completions. It seems that
we only got half of this patch for arm64, so add the missing call to
complete.
Reported-by: Jon Brawn <jon.brawn@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kernel/smp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 226b6bf6e9c2..538300f2273d 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c | |||
| @@ -211,8 +211,7 @@ asmlinkage void __cpuinit secondary_start_kernel(void) | |||
| 211 | * before we continue. | 211 | * before we continue. |
| 212 | */ | 212 | */ |
| 213 | set_cpu_online(cpu, true); | 213 | set_cpu_online(cpu, true); |
| 214 | while (!cpu_active(cpu)) | 214 | complete(&cpu_running); |
| 215 | cpu_relax(); | ||
| 216 | 215 | ||
| 217 | /* | 216 | /* |
| 218 | * OK, it's off to the idle thread for us | 217 | * OK, it's off to the idle thread for us |