1 files changed, 7 insertions, 5 deletions

diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c
index 5b9b901f6443..2df4785ffd4e 100644
--- a/arch/powerpc/platforms/85xx/smp.c
+++ b/arch/powerpc/platforms/85xx/smp.c
@@ -48,10 +48,11 @@ smp_85xx_kick_cpu(int nr)
         const u64 *cpu_rel_addr;
         __iomem u32 *bptr_vaddr;
         struct device_node *np;
-        int n = 0;
+        int n = 0, hw_cpu = get_hard_smp_processor_id(nr);
         int ioremappable;
 
-        WARN_ON (nr < 0 || nr >= NR_CPUS);
+        WARN_ON(nr < 0 || nr >= NR_CPUS);
+        WARN_ON(hw_cpu < 0 || hw_cpu >= NR_CPUS);
 
         pr_debug("smp_85xx_kick_cpu: kick CPU #%d\n", nr);
 
@@ -79,7 +80,7 @@ smp_85xx_kick_cpu(int nr)
 
         local_irq_save(flags);
 
-        out_be32(bptr_vaddr + BOOT_ENTRY_PIR, nr);
+        out_be32(bptr_vaddr + BOOT_ENTRY_PIR, hw_cpu);
 #ifdef CONFIG_PPC32
         out_be32(bptr_vaddr + BOOT_ENTRY_ADDR_LOWER, __pa(__early_start));
 
@@ -88,7 +89,7 @@ smp_85xx_kick_cpu(int nr)
                                 (ulong)(bptr_vaddr + SIZE_BOOT_ENTRY));
 
         /* Wait a bit for the CPU to ack. */
-        while ((__secondary_hold_acknowledge != nr) && (++n < 1000))
+        while ((__secondary_hold_acknowledge != hw_cpu) && (++n < 1000))
                 mdelay(1);
 #else
         smp_generic_kick_cpu(nr);
@@ -206,7 +207,7 @@ static void mpc85xx_smp_machine_kexec(struct kimage *image)
         if ( !timeout )
                 printk(KERN_ERR "Unable to bring down secondary cpu(s)");
 
-        for (i = 0; i < num_cpus; i++)
+        for_each_online_cpu(i)
         {
                 if ( i == smp_processor_id() ) continue;
                 mpic_reset_core(i);
@@ -243,6 +244,7 @@ void __init mpc85xx_smp_init(void)
                  * If left NULL, .message_pass defaults to
                  * smp_muxed_ipi_message_pass
                  */
+                smp_85xx_ops.message_pass = NULL;
                 smp_85xx_ops.cause_ipi = doorbell_cause_ipi;
         }