linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / powerpc / platforms / pseries / smp.c

diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index ac61098..8d710af 100644 (file)
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -14,6 +14,7 @@
 
 #undef DEBUG
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/sched.h>
@@ -416,18 +417,33 @@ static struct smp_ops_t pSeries_xics_smp_ops = {
 #endif
 
 /* This is called very early */
-static void __init smp_init_pseries(void)
+void __init smp_init_pSeries(void)
 {
        int i;
 
        DBG(" -> smp_init_pSeries()\n");
 
+       switch (ppc64_interrupt_controller) {
+#ifdef CONFIG_MPIC
+       case IC_OPEN_PIC:
+               smp_ops = &pSeries_mpic_smp_ops;
+               break;
+#endif
+#ifdef CONFIG_XICS
+       case IC_PPC_XIC:
+               smp_ops = &pSeries_xics_smp_ops;
+               break;
+#endif
+       default:
+               panic("Invalid interrupt controller");
+       }
+
 #ifdef CONFIG_HOTPLUG_CPU
        smp_ops->cpu_disable = pSeries_cpu_disable;
        smp_ops->cpu_die = pSeries_cpu_die;
 
        /* Processors can be added/removed only on LPAR */
-       if (firmware_has_feature(FW_FEATURE_LPAR))
+       if (platform_is_lpar())
                pSeries_reconfig_notifier_register(&pSeries_smp_nb);
 #endif
 
@@ -456,18 +472,3 @@ static void __init smp_init_pseries(void)
        DBG(" <- smp_init_pSeries()\n");
 }
 
-#ifdef CONFIG_MPIC
-void __init smp_init_pseries_mpic(void)
-{
-       smp_ops = &pSeries_mpic_smp_ops;
-
-       smp_init_pseries();
-}
-#endif
-
-void __init smp_init_pseries_xics(void)
-{
-       smp_ops = &pSeries_xics_smp_ops;
-
-       smp_init_pseries();
-}