On Jul 9, 2012, at 7:58 AM, Varun Sethi wrote: > Merge the 32 bit cpu setup code for e500mc/e5500 and define the "cpu_restore" > routine (for e5500/e6500) only for the 64 bit case. The cpu_restore routine > is used in the 64 bit case for setting up the secondary cores. > > Signed-off-by: Varun Sethi <varun.se...@freescale.com> > --- > arch/powerpc/kernel/cpu_setup_fsl_booke.S | 1 + > arch/powerpc/kernel/cputable.c | 4 ++++ > 2 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S > b/arch/powerpc/kernel/cpu_setup_fsl_booke.S > index a55d028..5e87737 100644 > --- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S > +++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S > @@ -75,6 +75,7 @@ _GLOBAL(__setup_cpu_e500v2) > mtlr r4 > blr > _GLOBAL(__setup_cpu_e500mc) > +_GLOBAL(__setup_cpu_e5500)
This is a bit confusing, as we now have duplicated __setup_cpu_e5500() between the ppc32 and ppc64 cases. If you build this patch for corenet32_smp_defconfig it fails. I'll fixup and add the proper #ifdef's to handle this. --- applied to next - k _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
