From: Dave Kleikamp <dave.kleikamp@oracle.com>
Date: Wed, 21 May 2014 18:30:49 +0000 (-0500)
Subject: sparc64: check for stopped cpu in smp_boot_one_cpu
X-Git-Tag: v4.1.12-92~147^2~3^2~24
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2d810483ac9e0565487dd31e88b7ee70acf8ad2f;p=users%2Fjedix%2Flinux-maple.git

sparc64: check for stopped cpu in smp_boot_one_cpu

original patch by Bob Picco

Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Cc: Bob Picco <bob.picco@oracle.com>
---

diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index ca564f91c5e2..726bac931bec 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -355,7 +355,9 @@ static int smp_boot_one_cpu(unsigned int cpu, struct task_struct *idle)
 
 	if (tlb_type == hypervisor) {
 #if defined(CONFIG_SUN_LDOMS) && defined(CONFIG_HOTPLUG_CPU)
-		if (ldom_domaining_enabled)
+		unsigned long hverror = sun4v_cpu_state(cpu);
+
+		if (ldom_domaining_enabled || (hverror == HV_CPU_STATE_STOPPED))
 			ldom_startcpu_cpuid(cpu,
 					    (unsigned long) cpu_new_thread,
 					    &descr);