1 files changed, 11 insertions, 5 deletions

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 8c3112a57cf2..174e1e96175e 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -69,6 +69,7 @@ unsigned long tce_alloc_start, tce_alloc_end;
 u64 ppc64_rma_size;
 #endif
 static phys_addr_t first_memblock_size;
+static int __initdata boot_cpu_count;
 
 static int __init early_parse_mem(char *p)
 {
@@ -769,6 +770,13 @@ void __init early_init_devtree(void *params)
          */
         of_scan_flat_dt(early_init_dt_scan_cpus, NULL);
 
+#if defined(CONFIG_SMP) && defined(CONFIG_PPC64)
+        /* We'll later wait for secondaries to check in; there are
+         * NCPUS-1 non-boot CPUs  :-)
+         */
+        spinning_secondaries = boot_cpu_count - 1;
+#endif
+
         DBG(" <- early_init_devtree()\n");
 }
 
@@ -862,16 +870,14 @@ static int prom_reconfig_notifier(struct notifier_block *nb,
         switch (action) {
         case PSERIES_RECONFIG_ADD:
                 err = of_finish_dynamic_node(node);
-                if (err < 0) {
+                if (err < 0)
                         printk(KERN_ERR "finish_node returned %d\n", err);
-                        err = NOTIFY_BAD;
-                }
                 break;
         default:
-                err = NOTIFY_DONE;
+                err = 0;
                 break;
         }
-        return err;
+        return notifier_from_errno(err);
 }
 
 static struct notifier_block prom_reconfig_nb = {