--- arch/powerpc/platforms/pseries/smp.c

+++ arch/powerpc/platforms/pseries/smp.c

@@ -56,6 +56,28 @@

*/

static cpumask_t of_spin_map;

+/* Query where a cpu is now. Return codes #defined in plpar_wrappers.h */

+int smp_query_cpu_stopped(unsigned int pcpu)

+{

+ int cpu_status, status;

+ int qcss_tok = rtas_token("query-cpu-stopped-state");

+

+ if (qcss_tok == RTAS_UNKNOWN_SERVICE) {

+ printk(KERN_INFO "Firmware doesn't support "

+ "query-cpu-stopped-state\n");

+ return QCSS_HARDWARE_ERROR;

+ }

+

+ status = rtas_call(qcss_tok, 1, 2, &cpu_status, pcpu);

+ if (status != 0) {

+ printk(KERN_ERR

+ "RTAS query-cpu-stopped-state failed: %i\n", status);

+ return status;

+ }

+

+ return cpu_status;

+}

+

/**

* smp_startup_cpu() - start the given cpu

*

@@ -81,6 +103,12 @@ static inline int __devinit smp_startup_

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;