[PATCH] ARM: shmobile: don't call platform_can_secondary_boot on UP

[PATCH] ARM: shmobile: don't call platform_can_secondary_boot on UP

[Arnd Bergmann]

For rcar-gen2, we build the SMP files even for UP configurations,
and that just broke:

arch/arm/mach-shmobile/built-in.o: In function `shmobile_smp_init_fallback_ops':
pm-rcar-gen2.c:(.init.text+0x40c): undefined reference to `platform_can_secondary_boot'

This adds an compile-time check before the call to platform_can_secondary_boot,
turning the function into an empty stub for UP configurations.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: c21af444eace ("ARM: shmobile: smp: Add function to prioritize DT SMP")
---
 arch/arm/mach-shmobile/platsmp.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c
index f3dba6f356e2..02e21bceb085 100644
--- a/arch/arm/mach-shmobile/platsmp.c
+++ b/arch/arm/mach-shmobile/platsmp.c
@@ -40,5 +40,8 @@ bool shmobile_smp_cpu_can_disable(unsigned int cpu)
 bool __init shmobile_smp_init_fallback_ops(void)
 {
 	/* fallback on PSCI/smp_ops if no other DT based method is detected */
+	if (!IS_ENABLED(CONFIG_SMP))
+		return false;
+
 	return platform_can_secondary_boot() ? true : false;
 }
-- 
2.9.0

Re: [PATCH] ARM: shmobile: don't call platform_can_secondary_boot on UP

[Geert Uytterhoeven]

Hi Arnd,

On Thu, Jun 30, 2016 at 2:25 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> For rcar-gen2, we build the SMP files even for UP configurations,
> and that just broke:
>
> arch/arm/mach-shmobile/built-in.o: In function `shmobile_smp_init_fallback_ops':
> pm-rcar-gen2.c:(.init.text+0x40c): undefined reference to `platform_can_secondary_boot'
>
> This adds an compile-time check before the call to platform_can_secondary_boot,
> turning the function into an empty stub for UP configurations.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: c21af444eace ("ARM: shmobile: smp: Add function to prioritize DT SMP")

Crap, I think I took the shortcut of only compile-testing
arch/arm/mach-shmobile,
not link-testing the whole kernel, with CONFIG_SMP=n...

Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] ARM: shmobile: don't call platform_can_secondary_boot on UP

[Simon Horman]

On Thu, Jun 30, 2016 at 03:09:46PM +0200, Geert Uytterhoeven wrote:
> Hi Arnd,
> 
> On Thu, Jun 30, 2016 at 2:25 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> > For rcar-gen2, we build the SMP files even for UP configurations,
> > and that just broke:
> >
> > arch/arm/mach-shmobile/built-in.o: In function `shmobile_smp_init_fallback_ops':
> > pm-rcar-gen2.c:(.init.text+0x40c): undefined reference to `platform_can_secondary_boot'
> >
> > This adds an compile-time check before the call to platform_can_secondary_boot,
> > turning the function into an empty stub for UP configurations.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > Fixes: c21af444eace ("ARM: shmobile: smp: Add function to prioritize DT SMP")
> 
> Crap, I think I took the shortcut of only compile-testing
> arch/arm/mach-shmobile,
> not link-testing the whole kernel, with CONFIG_SMP=n...
> 
> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

Sorry for missing this until now.
I have queued it up as a fix for v4.7.