mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 08:08:54 +00:00
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>
This commit is contained in:
parent
3fd45a136f
commit
703ef76b8f
1 changed files with 2 additions and 0 deletions
|
@ -31,7 +31,9 @@ ENTRY(shmobile_init_cntvoff)
|
||||||
ret lr
|
ret lr
|
||||||
ENDPROC(shmobile_init_cntvoff)
|
ENDPROC(shmobile_init_cntvoff)
|
||||||
|
|
||||||
|
#ifdef CONFIG_SMP
|
||||||
ENTRY(shmobile_boot_apmu)
|
ENTRY(shmobile_boot_apmu)
|
||||||
bl shmobile_init_cntvoff
|
bl shmobile_init_cntvoff
|
||||||
b secondary_startup
|
b secondary_startup
|
||||||
ENDPROC(shmobile_boot_apmu)
|
ENDPROC(shmobile_boot_apmu)
|
||||||
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue