Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e08ecba1 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/64s: Fix build failures with CONFIG_NMI_IPI=n 



I broke the build when CONFIG_NMI_IPI=n with my recent commit to add
arch_trigger_cpumask_backtrace(), eg:

  stacktrace.c:(.text+0x1b0): undefined reference to `.smp_send_safe_nmi_ipi'

We should rework the CONFIG symbols here in future to avoid these
double barrelled ifdefs but for now they fix the build.

Fixes: 5cc05910 ("powerpc/64s: Wire up arch_trigger_cpumask_backtrace()")
Reported-by: default avatarChristophe LEROY <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 855b6232

arch/powerpc/include/asm/nmi.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ extern void arch_touch_nmi_watchdog(void); 
static inline void arch_touch_nmi_watchdog(void) {}

#endif



#if defined(CONFIG_PPC_BOOK3S_64) && defined(CONFIG_STACKTRACE)

#if defined(CONFIG_NMI_IPI) && defined(CONFIG_STACKTRACE)

extern void arch_trigger_cpumask_backtrace(const cpumask_t *mask,

					   bool exclude_self);

#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace

arch/powerpc/kernel/stacktrace.c

+2 −2
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ save_stack_trace_tsk_reliable(struct task_struct *tsk, 
EXPORT_SYMBOL_GPL(save_stack_trace_tsk_reliable);

#endif /* CONFIG_HAVE_RELIABLE_STACKTRACE */



#ifdef CONFIG_PPC_BOOK3S_64

#if defined(CONFIG_PPC_BOOK3S_64) && defined(CONFIG_NMI_IPI)

static void handle_backtrace_ipi(struct pt_regs *regs)

{

	nmi_cpu_backtrace(regs);
@@ -242,4 +242,4 @@ void arch_trigger_cpumask_backtrace(const cpumask_t *mask, bool exclude_self) 
{

	nmi_trigger_cpumask_backtrace(mask, exclude_self, raise_backtrace_ipi);

}

#endif /* CONFIG_PPC64 */
 
#endif /* defined(CONFIG_PPC_BOOK3S_64) && defined(CONFIG_NMI_IPI) */