Merge branch 'master' into upstream

1 files changed, 21 insertions, 0 deletions

diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index aa701cc27ecc..4e54a09dd33b 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1395,4 +1395,25 @@ void smp_mpic_message_pass(int target, int msg)
                 break;
         }
 }
+
+int __init smp_mpic_probe(void)
+{
+        int nr_cpus;
+
+        DBG("smp_mpic_probe()...\n");
+
+        nr_cpus = cpus_weight(cpu_possible_map);
+
+        DBG("nr_cpus: %d\n", nr_cpus);
+
+        if (nr_cpus > 1)
+                mpic_request_ipis();
+
+        return nr_cpus;
+}
+
+void __devinit smp_mpic_setup_cpu(int cpu)
+{
+        mpic_setup_this_cpu();
+}
 #endif /* CONFIG_SMP */