diff options
author | Will Deacon <will.deacon@arm.com> | 2012-11-07 17:00:05 +0000 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-11-08 16:06:21 +0000 |
commit | b3770b3252589240e50f560197a19531979abba2 (patch) | |
tree | 19d41ca9a8c8ea9b10a9e40ccd53faecb13d5a32 | |
parent | 6212a512240f48d84090bc42a24d6dfb033754bc (diff) | |
download | op-kernel-dev-b3770b3252589240e50f560197a19531979abba2.zip op-kernel-dev-b3770b3252589240e50f560197a19531979abba2.tar.gz |
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>
-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 226b6bf..538300f 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -211,8 +211,7 @@ asmlinkage void __cpuinit secondary_start_kernel(void) * before we continue. */ set_cpu_online(cpu, true); - while (!cpu_active(cpu)) - cpu_relax(); + complete(&cpu_running); /* * OK, it's off to the idle thread for us |