summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel
diff options
context:
space:
mode:
authorAl Viro2012-11-17 04:28:43 +0100
committerAl Viro2012-11-17 04:28:43 +0100
commit2bf81c8af92dd53890557c5d87875842d573a3e9 (patch)
tree83e7e3539599b091ac69557658c06c0a39cfa60e /arch/arm64/kernel
parentMerge branch 'arch-arm64' into no-rebases (diff)
parentmicroblaze: switch to generic sys_execve() (diff)
downloadkernel-qcow2-linux-2bf81c8af92dd53890557c5d87875842d573a3e9.tar.gz
kernel-qcow2-linux-2bf81c8af92dd53890557c5d87875842d573a3e9.tar.xz
kernel-qcow2-linux-2bf81c8af92dd53890557c5d87875842d573a3e9.zip
Merge branch 'arch-microblaze' into no-rebases
Diffstat (limited to 'arch/arm64/kernel')
-rw-r--r--arch/arm64/kernel/smp.c3
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)
* 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