From 913b8d70306f1c77282943f0a7d8278bb9feec10 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Wed, 7 Nov 2012 17:00:05 +0000
Subject: [PATCH] --- yaml --- r: 335561 b: refs/heads/master c:
 b3770b3252589240e50f560197a19531979abba2 h: refs/heads/master i:   335559:
 85564e7e81a0dfd00dddec815aa3356a431a3542 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/arm64/kernel/smp.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e512bb7b5daf..ea9807154205 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6212a512240f48d84090bc42a24d6dfb033754bc
+refs/heads/master: b3770b3252589240e50f560197a19531979abba2
diff --git a/trunk/arch/arm64/kernel/smp.c b/trunk/arch/arm64/kernel/smp.c
index 226b6bf6e9c2..538300f2273d 100644
--- a/trunk/arch/arm64/kernel/smp.c
+++ b/trunk/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