[PATCH 61/62] ARM: sunxi: fix build for THUMB2_KERNEL

Arnd Bergmann arnd at arndb.de
Fri Mar 21 14:40:03 EDT 2014


On Friday 21 March 2014 13:21:04 Rob Herring wrote:
> > diff --git a/arch/arm/mach-sunxi/platsmp.c b/arch/arm/mach-sunxi/platsmp.c
> > index 7b141d8..3f9b889 100644
> > --- a/arch/arm/mach-sunxi/platsmp.c
> > +++ b/arch/arm/mach-sunxi/platsmp.c
> > @@ -82,7 +82,7 @@ static int sun6i_smp_boot_secondary(unsigned int cpu,
> >         spin_lock(&cpu_lock);
> >
> >         /* Set CPU boot address */
> > -       writel(virt_to_phys(sun6i_secondary_startup),
> > +       writel(virt_to_phys(secondary_startup),
> >                cpucfg_membase + CPUCFG_PRIVATE0_REG);
> >
> >         /* Assert the CPU core in reset */
> > @@ -120,5 +120,5 @@ static int sun6i_smp_boot_secondary(unsigned int cpu,
> >
> >  struct smp_operations sun6i_smp_ops __initdata = {
> >         .smp_prepare_cpus       = sun6i_smp_prepare_cpus,
> > -       .smp_boot_secondary     = sun6i_smp_boot_secondary,
> > +       .smp_boot_secondary     = sun6i_smp_secondary_startup,
> 
> ?? This looks unintentional.
> 

Yes, I just noticed the same thing after testing the resulting tree.

I also had to add a global declaration for secondary_startup, which apparently
mach-qcom also needs but added locally.

	Arnd



More information about the linux-arm-kernel mailing list