]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[POWERPC] Move MPIC smp routines into mpic.c
authorMichael Ellerman <michael@ellerman.id.au>
Thu, 8 Feb 2007 07:34:04 +0000 (18:34 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 14 Feb 2007 00:50:04 +0000 (11:50 +1100)
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>
arch/powerpc/kernel/smp.c
arch/powerpc/sysdev/mpic.c

index 0e8beca460af59d8b814e99701a1bc65560ba4ba..924d692bc8f9249fd5b0feb091b195bfd08fbfa7 100644 (file)
@@ -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)
 {
index aa701cc27ecc5e20af599e4d66c28ca0c81f097c..4e54a09dd33b1fc0c197ad77fa4c47123ba6b0a5 100644 (file)
@@ -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 */