mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
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>
This commit is contained in:
parent
d4fc8fe1f6
commit
17f9c8a73b
2 changed files with 15 additions and 21 deletions
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue