diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-04 04:28:50 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-10 06:02:49 -0400 |
commit | a7f4ee1fe93aa9ae191971be9324edb8f9fbcb4a (patch) | |
tree | d462b76619518d4d35a1cadb026297c77c2f7816 /arch/powerpc/include/asm | |
parent | 7261b956b276aa97fbf60d00f1d7717d2ea6ee78 (diff) |
powerpc: Drop return value of smp_ops->probe()
smp_ops->probe() is currently supposed to return the number of cpus in
the system.
The last actual usage of the value was removed in May 2007 in e147ec8f1808
"[POWERPC] Simplify smp_space_timers". We still passed the value around
until June 2010 when even that was finally removed in c1aa687d499a
"powerpc: Clean up obsolete code relating to decrementer and timebase".
So drop that requirement, probe() now returns void, and update all
implementations.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/include/asm')
-rw-r--r-- | arch/powerpc/include/asm/smp.h | 4 | ||||
-rw-r--r-- | arch/powerpc/include/asm/xics.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h index 7c19959cd705..825663c30945 100644 --- a/arch/powerpc/include/asm/smp.h +++ b/arch/powerpc/include/asm/smp.h | |||
@@ -42,7 +42,7 @@ struct smp_ops_t { | |||
42 | #ifdef CONFIG_PPC_SMP_MUXED_IPI | 42 | #ifdef CONFIG_PPC_SMP_MUXED_IPI |
43 | void (*cause_ipi)(int cpu, unsigned long data); | 43 | void (*cause_ipi)(int cpu, unsigned long data); |
44 | #endif | 44 | #endif |
45 | int (*probe)(void); | 45 | void (*probe)(void); |
46 | int (*kick_cpu)(int nr); | 46 | int (*kick_cpu)(int nr); |
47 | void (*setup_cpu)(int nr); | 47 | void (*setup_cpu)(int nr); |
48 | void (*bringup_done)(void); | 48 | void (*bringup_done)(void); |
@@ -174,7 +174,7 @@ static inline void set_hard_smp_processor_id(int cpu, int phys) | |||
174 | 174 | ||
175 | extern int smt_enabled_at_boot; | 175 | extern int smt_enabled_at_boot; |
176 | 176 | ||
177 | extern int smp_mpic_probe(void); | 177 | extern void smp_mpic_probe(void); |
178 | extern void smp_mpic_setup_cpu(int cpu); | 178 | extern void smp_mpic_setup_cpu(int cpu); |
179 | extern int smp_generic_kick_cpu(int nr); | 179 | extern int smp_generic_kick_cpu(int nr); |
180 | extern int smp_generic_cpu_bootable(unsigned int nr); | 180 | extern int smp_generic_cpu_bootable(unsigned int nr); |
diff --git a/arch/powerpc/include/asm/xics.h b/arch/powerpc/include/asm/xics.h index 6997f4a271df..0e25bdb190bb 100644 --- a/arch/powerpc/include/asm/xics.h +++ b/arch/powerpc/include/asm/xics.h | |||
@@ -146,7 +146,7 @@ extern void xics_update_irq_servers(void); | |||
146 | extern void xics_set_cpu_giq(unsigned int gserver, unsigned int join); | 146 | extern void xics_set_cpu_giq(unsigned int gserver, unsigned int join); |
147 | extern void xics_mask_unknown_vec(unsigned int vec); | 147 | extern void xics_mask_unknown_vec(unsigned int vec); |
148 | extern irqreturn_t xics_ipi_dispatch(int cpu); | 148 | extern irqreturn_t xics_ipi_dispatch(int cpu); |
149 | extern int xics_smp_probe(void); | 149 | extern void xics_smp_probe(void); |
150 | extern void xics_register_ics(struct ics *ics); | 150 | extern void xics_register_ics(struct ics *ics); |
151 | extern void xics_teardown_cpu(void); | 151 | extern void xics_teardown_cpu(void); |
152 | extern void xics_kexec_teardown_cpu(int secondary); | 152 | extern void xics_kexec_teardown_cpu(int secondary); |