sugar/linux
1
0
Fork 0
Code Activity

ARM: shmobile: rcar-gen2: fix non-SMP build

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2017-10-05 14:09:04 +02:00
committed by Simon Horman
parent 3fd45a136f
commit 703ef76b8f
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-shmobile/headsmp-apmu.S
View File

@@ -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