powerpc: Merge 32-bit and 64-bit setup_arch()
There is little enough differences now. mpe: Add a/p/k/setup.h to contain the prototypes and empty versions of functions we need, rather than using weak functions. Add a few other empty versions to avoid as many #ifdefs as possible in the code. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:

committed by
Michael Ellerman

parent
009776baa1
commit
b1923caa6e
@@ -160,9 +160,6 @@ static inline void set_hard_smp_processor_id(int cpu, int phys)
|
||||
{
|
||||
paca[cpu].hw_cpu_id = phys;
|
||||
}
|
||||
|
||||
extern void smp_release_cpus(void);
|
||||
|
||||
#else
|
||||
/* 32-bit */
|
||||
#ifndef CONFIG_SMP
|
||||
@@ -179,6 +176,12 @@ static inline void set_hard_smp_processor_id(int cpu, int phys)
|
||||
#endif /* !CONFIG_SMP */
|
||||
#endif /* !CONFIG_PPC64 */
|
||||
|
||||
#if defined(CONFIG_PPC64) && (defined(CONFIG_SMP) || defined(CONFIG_KEXEC))
|
||||
extern void smp_release_cpus(void);
|
||||
#else
|
||||
static inline void smp_release_cpus(void) { };
|
||||
#endif
|
||||
|
||||
extern int smt_enabled_at_boot;
|
||||
|
||||
extern void smp_mpic_probe(void);
|
||||
|
Reference in New Issue
Block a user