blob: 07d0be3a160026cbb105bf6b3330d85a92054384 [file] [log] [blame]
From 0fd0162006ab86bf8ea25ae63abdb03c3e932b13 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <>
Date: Thu, 5 Oct 2017 14:09:04 +0200
Subject: [PATCH 0357/1795] 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 <>
Acked-by: Geert Uytterhoeven <>
Signed-off-by: Simon Horman <>
(cherry picked from commit 703ef76b8fd5169d5cff30de5b958d6728b9a147)
Signed-off-by: Simon Horman <>
Signed-off-by: Geert Uytterhoeven <>
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
+#ifdef CONFIG_SMP
bl shmobile_init_cntvoff
b secondary_startup