powerpc: Move smp_ops_t from machdep.h to smp.h

I can't see any reason these functions are needed by machdep.h
and they are all hidden by CONFIG_SMP with no UP alternative.

Also move the declarations for the fallback timebase ops, which
are used to fill in the smp ops.

Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index b0802a5bd744792ee99b6eba1987fa5c66f988b0..47cacddb14cf26732a4550bbd213333f06df15be 100644 (file)
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -29,21 +29,6 @@ struct file;
 struct pci_controller;
 struct kimage;
 
-#ifdef CONFIG_SMP
-struct smp_ops_t {
-       void  (*message_pass)(int cpu, int msg);
-       int   (*probe)(void);
-       int   (*kick_cpu)(int nr);
-       void  (*setup_cpu)(int nr);
-       void  (*bringup_done)(void);
-       void  (*take_timebase)(void);
-       void  (*give_timebase)(void);
-       int   (*cpu_disable)(void);
-       void  (*cpu_die)(unsigned int nr);
-       int   (*cpu_bootable)(unsigned int nr);
-};
-#endif
-
 struct machdep_calls {
        char            *name;
 #ifdef CONFIG_PPC64
@@ -312,12 +297,6 @@ extern sys_ctrler_t sys_ctrler;
 
 #endif /* CONFIG_PPC_PMAC */
 
-#ifdef CONFIG_SMP
-/* Poor default implementations */
-extern void __devinit smp_generic_give_timebase(void);
-extern void __devinit smp_generic_take_timebase(void);
-#endif /* CONFIG_SMP */
-
 
 /* Functions to produce codes on the leds.
  * The SRC code should be unique for the message category and should

diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
index 91472c56800f524dba5bb0fe8a0bcca717c31f54..6f7c95c0027a80a7b9321a0873705a127c161f52 100644 (file)
--- a/arch/powerpc/include/asm/smp.h
+++ b/arch/powerpc/include/asm/smp.h
@@ -35,9 +35,24 @@ extern void cpu_die(void);
 
 #ifdef CONFIG_SMP
 
+struct smp_ops_t {
+       void  (*message_pass)(int cpu, int msg);
+       int   (*probe)(void);
+       int   (*kick_cpu)(int nr);
+       void  (*setup_cpu)(int nr);
+       void  (*bringup_done)(void);
+       void  (*take_timebase)(void);
+       void  (*give_timebase)(void);
+       int   (*cpu_disable)(void);
+       void  (*cpu_die)(unsigned int nr);
+       int   (*cpu_bootable)(unsigned int nr);
+};
+
 extern void smp_send_debugger_break(void);
 extern void smp_message_recv(int);
 extern void start_secondary_resume(void);
+extern void __devinit smp_generic_give_timebase(void);
+extern void __devinit smp_generic_take_timebase(void);
 
 DECLARE_PER_CPU(unsigned int, cpu_pvr);