[POWERPC] Fix non-MPIC CHRPs with CONFIG_SMP set

Pseudo-CHRP machines like Pegasos without an MPIC would crash at boot if
CONFIG_SMP was set because the "smp_ops" pointer was set to MPIC related
ops unconditionally. This patch makes it NULL on machines that don't
support SMP and provides proper default behaviour in the callers when
smp_ops is NULL.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 8 insertions, 4 deletions

diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 538e337d63e2..9c08ff322290 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -291,10 +291,6 @@ void __init chrp_setup_arch(void)
 
         pci_create_OF_bus_map();
 
-#ifdef CONFIG_SMP
-        smp_ops = &chrp_smp_ops;
-#endif /* CONFIG_SMP */
-
         /*
          * Print the banner, then scroll down so boot progress
          * can be printed.  -- Cort
@@ -479,6 +475,14 @@ void __init chrp_init_IRQ(void)
         chrp_find_openpic();
         chrp_find_8259();
 
+#ifdef CONFIG_SMP
+        /* Pegasos has no MPIC, those ops would make it crash. It might be an
+         * option to move setting them to after we probe the PIC though
+         */
+        if (chrp_mpic != NULL)
+                smp_ops = &chrp_smp_ops;
+#endif /* CONFIG_SMP */
+
         if (_chrp_type == _CHRP_Pegasos)
                 ppc_md.get_irq        = i8259_irq;