diff options
| -rw-r--r-- | arch/powerpc/platforms/85xx/smp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c index 30721ac..b47bbd4 100644 --- a/arch/powerpc/platforms/85xx/smp.c +++ b/arch/powerpc/platforms/85xx/smp.c @@ -212,7 +212,7 @@ void platform_cpu_die(unsigned int cpu) /* enter PH20 status */ setbits32(&((struct ccsr_rcpm_v2 *)guts_regs)->pcph20setr, 1 << cpu_core_index_of_thread(hw_cpu)); - } else if (!rcpmv2) { + } else if (!rcpmv2 && guts_regs) { rcpm = guts_regs; /* Core Nap Operation */ setbits32(&rcpm->cnapcr, 1 << hw_cpu); @@ -587,6 +587,10 @@ void __init mpc85xx_smp_init(void) smp_85xx_ops.cause_ipi = doorbell_cause_ipi; } +#ifdef CONFIG_HOTPLUG_CPU + ppc_md.cpu_die = generic_mach_cpu_die; +#endif + np = of_find_matching_node(NULL, mpc85xx_smp_guts_ids); if (np) { if (of_device_is_compatible(np, "fsl,qoriq-rcpm-2.0")) |