Skip to contentSkip to conversation

Fix shmobile build with CONFIG_SMP=n

PATCH New Russell King - ARM Linux 4 participants 5 messages Jul 19, 2016 – Aug 8, 2016

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm/RISC-V/Renesas architecture
lore
Share & tools
lore

Russell King - ARM Linux

author maintainer
#0 lore raw

PATCH 1/1 Fix shmobile build with CONFIG_SMP=n

Shmobile currently fails to build when CONFIG_SMP is disabled:

arch/arm/mach-shmobile/built-in.o: In function `shmobile_smp_init_fallback_ops':
pm-rcar-gen2.c:(.init.text+0x744): undefined reference to `platform_can_secondary_boot' make[1]: *** [vmlinux] Error 1

Fix this by providing a stub for this function.

Signed-off-by Russell King <[email protected]>

---
Untested, please test.

 arch/arm/mach-shmobile/common.h  | 7 +++++++
 arch/arm/mach-shmobile/platsmp.c | 2 ++
 2 files changed, 9 insertions(+)
arch/arm/mach-shmobile/common.h +7 -0
index 1a8f7b3ab449..6badb3e41cfa 100644
@@ -10,7 +10,14 @@ extern void shmobile_smp_sleep(void);
 extern void shmobile_smp_hook(unsigned int cpu, unsigned long fn,
 			      unsigned long arg);
 extern bool shmobile_smp_cpu_can_disable(unsigned int cpu);
+#ifdef CONFIG_SMP
 extern bool shmobile_smp_init_fallback_ops(void);
+#else
+static inline bool shmobile_smp_init_fallback_ops(void)
+{
+	return false;
+}
+#endif
 extern void shmobile_boot_scu(void);
 extern void shmobile_smp_scu_prepare_cpus(phys_addr_t scu_base_phys,
 					  unsigned int max_cpus);
arch/arm/mach-shmobile/platsmp.c +2 -0
index f3dba6f356e2..44d91f5624a3 100644
@@ -37,8 +37,10 @@ bool shmobile_smp_cpu_can_disable(unsigned int cpu)
 }
 #endif
 
+#ifdef CONFIG_SMP
 bool __init shmobile_smp_init_fallback_ops(void)
 {
 	/* fallback on PSCI/smp_ops if no other DT based method is detected */
 	return platform_can_secondary_boot() ? true : false;
 }
+#endif
Signature · 3 lines
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.
#1 lore raw

PATCH 1/1 Fix shmobile build with CONFIG_SMP=n

Hi Russell,

Quoted 9 lines · Russell King - ARM Linux

Shmobile currently fails to build when CONFIG_SMP is disabled:

arch/arm/mach-shmobile/built-in.o: In function `shmobile_smp_init_fallback_ops':
pm-rcar-gen2.c:(.init.text+0x744): undefined reference to `platform_can_secondary_boot' make[1]: *** [vmlinux] Error 1

Fix this by providing a stub for this function.

Signed-off-by Russell King <[email protected]>

Arnd send a smaller one https://patchwork.kernel.org/patch/9207413/,
which seems have fallen through the cracks.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at 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

#2 lore raw

PATCH 1/1 Fix shmobile build with CONFIG_SMP=n

Quoted 10 lines · Geert Uytterhoeven

Hi Russell,

Quoted 6 lines · Russell King - ARM Linux

Shmobile currently fails to build when CONFIG_SMP is disabled:

arch/arm/mach-shmobile/built-in.o: In function `shmobile_smp_init_fallback_ops':
pm-rcar-gen2.c:(.init.text+0x744): undefined reference to `platform_can_secondary_boot' make[1]: *** [vmlinux] Error 1

Quoted 6 lines
Quoted 3 lines

Fix this by providing a stub for this function.

Signed-off-by Russell King <[email protected]>

Arnd send a smaller one https://patchwork.kernel.org/patch/9207413/,
which seems have fallen through the cracks.

Sorry for missing that. I have queued up Arnd's patch as a fix for v4.8 with Acked-by Geert and a Reported-by Russel tags.

#3 lore raw

PATCH 1/1 Fix shmobile build with CONFIG_SMP=n

Hi,

Quoted 13 lines · Simon Horman
Quoted 12 lines · Geert Uytterhoeven

Hi Russell,

Quoted 8 lines · Russell King - ARM Linux

Shmobile currently fails to build when CONFIG_SMP is disabled:

arch/arm/mach-shmobile/built-in.o: In function `shmobile_smp_init_fallback_ops':
pm-rcar-gen2.c:(.init.text+0x744): undefined reference to `platform_can_secondary_boot' make[1]: *** [vmlinux] Error 1

Fix this by providing a stub for this function.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Russell King <[email protected]>

Arnd send a smaller one https://patchwork.kernel.org/patch/9207413/,
which seems have fallen through the cracks.

Sorry for missing that. I have queued up Arnd's patch as a fix for v4.8 with Acked-by Geert and a Reported-by Russel tags.

Since I haven't seen this patch yet, I've applied it (Arnd's version) directly to our fixes branch.

-Olof

#4 lore raw

PATCH 1/1 Fix shmobile build with CONFIG_SMP=n

Quoted 18 lines · Olof Johansson

Hi,

Quoted 15 lines · Simon Horman
Quoted 14 lines · Geert Uytterhoeven

Hi Russell,

Quoted 9 lines · Russell King - ARM Linux

Shmobile currently fails to build when CONFIG_SMP is disabled:

arch/arm/mach-shmobile/built-in.o: In function `shmobile_smp_init_fallback_ops':
pm-rcar-gen2.c:(.init.text+0x744): undefined reference to `platform_can_secondary_boot' make[1]: *** [vmlinux] Error 1

Fix this by providing a stub for this function.

Signed-off-by Russell King <[email protected]>
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

Arnd send a smaller one https://patchwork.kernel.org/patch/9207413/,
which seems have fallen through the cracks.

Sorry for missing that. I have queued up Arnd's patch as a fix for v4.8 with Acked-by Geert and a Reported-by Russel tags.

Since I haven't seen this patch yet, I've applied it (Arnd's version) directly to our fixes branch.

Thanks. The progression through my tree got delayed by me taking a holiday last week. I'll drop it from my tree as you have picked it up.