--- arch/powerpc/platforms/pseries/hotplug-cpu.c

+++ arch/powerpc/platforms/pseries/hotplug-cpu.c

@@ -66,30 +66,6 @@ static void pseries_mach_cpu_die(void)

for(;;);

}

-static int qcss_tok; /* query-cpu-stopped-state token */

-

-/* Get state of physical CPU.

- * Return codes:

- * 0 - The processor is in the RTAS stopped state

- * 1 - stop-self is in progress

- * 2 - The processor is not in the RTAS stopped state

- * -1 - Hardware Error

- * -2 - Hardware Busy, Try again later.

- */

-static int query_cpu_stopped(unsigned int pcpu)

-{

- int cpu_status, status;

-

- 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;

-}

-

static int pseries_cpu_disable(void)

{

int cpu = smp_processor_id();

@@ -113,8 +89,9 @@ static void pseries_cpu_die(unsigned int

unsigned int pcpu = get_hard_smp_processor_id(cpu);

for (tries = 0; tries < 25; tries++) {

- cpu_status = query_cpu_stopped(pcpu);

- if (cpu_status == 0 || cpu_status == -1)

+ cpu_status = smp_query_cpu_stopped(pcpu);

+ if (cpu_status == QCSS_STOPPED ||

+ cpu_status == QCSS_HARDWARE_ERROR)

break;

cpu_relax();

}

@@ -256,6 +233,7 @@ static int __init pseries_cpu_hotplug_in

{

struct device_node *np;

const char *typep;

+ int qcss_tok;

for_each_node_by_name(np, "interrupt-controller") {

typep = of_get_property(np, "compatible", NULL);