[POWERPC] Move MPIC smp routines into mpic.c

Move a couple of MPIC smp routines into mpic.c, they're inside an SMP
block in mpic.c - so they're still only built for SMP.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 21 insertions, 23 deletions

diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 0e8beca460af..924d692bc8f9 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -78,29 +78,6 @@ int smt_enabled_at_boot = 1;
 
 static void (*crash_ipi_function_ptr)(struct pt_regs *) = NULL;
 
-#ifdef CONFIG_MPIC
-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_MPIC */
-
 #ifdef CONFIG_PPC64
 void __devinit smp_generic_kick_cpu(int nr)
 {
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 */