diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-05 14:09:04 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2017-10-11 09:40:12 +0200 |
| commit | 703ef76b8fd5169d5cff30de5b958d6728b9a147 (patch) | |
| tree | 4c5f41a2ad4c88d8ae76498cda9044287ff6a499 /arch/arm/mach-shmobile | |
| parent | ARM: shmobile: rcar-gen2: Make sure CNTVOFF is initialized on CA7/15 (diff) | |
| download | linux-703ef76b8fd5169d5cff30de5b958d6728b9a147.tar.xz linux-703ef76b8fd5169d5cff30de5b958d6728b9a147.zip | |
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>
Diffstat (limited to 'arch/arm/mach-shmobile')
| -rw-r--r-- | arch/arm/mach-shmobile/headsmp-apmu.S | 2 |
1 files changed, 2 insertions, 0 deletions
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 |