From 9b8917674a2f692b12b6c19b023712267fd09842 Mon Sep 17 00:00:00 2001
From: Michael Neuling <mikey@neuling.org>
Date: Wed, 28 Apr 2010 13:39:41 +0000
Subject: [PATCH] --- yaml --- r: 196622 b: refs/heads/master c:
 aef40e87d866355ffd279ab21021de733242d0d5 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/powerpc/platforms/pseries/smp.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e25b8a96eaa5..648c3d24830e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8b67691828321f5c85bb853283aa101ae673130
+refs/heads/master: aef40e87d866355ffd279ab21021de733242d0d5
diff --git a/trunk/arch/powerpc/platforms/pseries/smp.c b/trunk/arch/powerpc/platforms/pseries/smp.c
index 20b694280a66..8979982eb2ee 100644
--- a/trunk/arch/powerpc/platforms/pseries/smp.c
+++ b/trunk/arch/powerpc/platforms/pseries/smp.c
@@ -104,6 +104,12 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
 
 	pcpu = get_hard_smp_processor_id(lcpu);
 
+	/* Check to see if the CPU out of FW already for kexec */
+	if (smp_query_cpu_stopped(pcpu) == QCSS_NOT_STOPPED){
+		cpu_set(lcpu, of_spin_map);
+		return 1;
+	}
+
 	/* Fixup atomic count: it exited inside IRQ handler. */
 	task_thread_info(paca[lcpu].__current)->preempt_count	= 0;