From: Vadim Lomovtsev <Vadim.Lomovtsev@caviumnetworks.com>
Date: Fri, 18 Sep 2015 12:17:21 +0000 (-0700)
Subject: Thunderx, numa: workaround CPU95 startup timeout issue
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fcentos-baseline;p=people%2Fjulieng%2Flinux-arm.git

Thunderx, numa: workaround CPU95 startup timeout issue

Signed-off-by: Vadim Lomovtsev <Vadim.Lomovtsev@caviumnetworks.com>
---

diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index bdf0358a5aa3..ac88c433aedf 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -107,7 +107,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle)
 		 * time out.
 		 */
 		wait_for_completion_timeout(&cpu_running,
-					    msecs_to_jiffies(1000));
+					    msecs_to_jiffies(2000));
 
 		if (!cpu_online(cpu)) {
 			pr_crit("CPU%u: failed to come online\n", cpu);