ARM: shmobile: rcar-gen2: fix non-SMP build
authorArnd Bergmann <arnd@arndb.de>
Thu, 5 Oct 2017 12:09:04 +0000 (14:09 +0200)
committerSimon Horman <horms+renesas@verge.net.au>
Wed, 11 Oct 2017 07:40:12 +0000 (09:40 +0200)
commit703ef76b8fd5169d5cff30de5b958d6728b9a147
tree4c5f41a2ad4c88d8ae76498cda9044287ff6a499
parent3fd45a136ff61bb54deab70fb2d534a85e40481f
ARM: shmobile: rcar-gen2: fix non-SMP build

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.

Fixes: fd45a136ff6 ("ARM: shmobile: rcar-gen2: Make sure CNTVOFF is initialized on CA7/15")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/mach-shmobile/headsmp-apmu.S