diff mbox

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

Message ID dc15ca962757ca72a4492b2e13be2eecc6dcd716.1507623048.git.horms+renesas@verge.net.au (mailing list archive)
State Accepted
Commit 703ef76b8fd5169d5cff30de5b958d6728b9a147
Headers show

Commit Message

Simon Horman Oct. 10, 2017, 8:12 a.m. UTC 
From: Arnd Bergmann <arnd@arndb.de>

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.

3fd45a136ff6 ("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 | 2 ++
 1 file changed, 2 insertions(+)

Comments

Sergei Shtylyov Oct. 10, 2017, 9:25 a.m. UTC | #1 
Hello!

On 10/10/2017 11:12 AM, Simon Horman wrote:

> From: Arnd Bergmann <arnd@arndb.de>
> 
> 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.
> 
> 3fd45a136ff6 ("ARM: shmobile: rcar-gen2: Make sure CNTVOFF is initialized on CA7/15")

    "Fixes:"?

> 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>
[...]

MBR, Sergei
Simon Horman Oct. 11, 2017, 7:42 a.m. UTC | #2 
On Tue, Oct 10, 2017 at 12:25:42PM +0300, Sergei Shtylyov wrote:
> Hello!
> 
> On 10/10/2017 11:12 AM, Simon Horman wrote:
> 
> >From: Arnd Bergmann <arnd@arndb.de>
> >
> >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.
> >
> >3fd45a136ff6 ("ARM: shmobile: rcar-gen2: Make sure CNTVOFF is initialized on CA7/15")
> 
>    "Fixes:"?

Thanks, I will fix and repost.
diff mbox

Patch

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