From: Arnd Bergmann <a...@arndb.de> A bugfix for the SMP case broke the build for the UP case:
arch/arm/mach-shmobile/headsmp-apmu.o: In function `shmobile_boot_apmu': (.text+0x34): undefined reference to `secondary_startup' The assembler file mixes code that is used for SMP with code that we also need on a single-CPU build, so I'm leaving it always enabled in the Makefile, but enclose the SMP code in an #ifdef. 3fd45a136ff6 ("ARM: shmobile: rcar-gen2: Make sure CNTVOFF is initialized on CA7/15") Signed-off-by: Arnd Bergmann <a...@arndb.de> Acked-by: Geert Uytterhoeven <geert+rene...@glider.be> Signed-off-by: Simon Horman <horms+rene...@verge.net.au> --- arch/arm/mach-shmobile/headsmp-apmu.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-shmobile/headsmp-apmu.S b/arch/arm/mach-shmobile/headsmp-apmu.S index db4743d2bf91..5672b5849401 100644 --- a/arch/arm/mach-shmobile/headsmp-apmu.S +++ b/arch/arm/mach-shmobile/headsmp-apmu.S @@ -31,7 +31,9 @@ ENTRY(shmobile_init_cntvoff) ret lr ENDPROC(shmobile_init_cntvoff) +#ifdef CONFIG_SMP ENTRY(shmobile_boot_apmu) bl shmobile_init_cntvoff b secondary_startup ENDPROC(shmobile_boot_apmu) +#endif -- 2.1.4