diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-06-30 14:25:19 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-08-02 12:34:49 -0700 |
| commit | 869ec056fa8450184423c8076e0a342db127795c (patch) | |
| tree | 3443694c0b2d14e931844392a74ef7c1a7f65886 /arch/arm/mach-shmobile | |
| parent | 4d2bf027e8ca499a52224e508f52a59d3858094a (diff) | |
| download | op-kernel-dev-869ec056fa8450184423c8076e0a342db127795c.zip op-kernel-dev-869ec056fa8450184423c8076e0a342db127795c.tar.gz | |
ARM: shmobile: don't call platform_can_secondary_boot on UP
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")
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile')
| -rw-r--r-- | arch/arm/mach-shmobile/platsmp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c index f3dba6f..02e21bc 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; } |
