summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-03-11 11:50:36 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2022-03-11 11:50:36 -0800
commit878409ecde7c89c9f3db76ff1ef9486c6ceed02c (patch)
treed1acf71dccf177865559138dca81e583932535a7
parent6c7cb60bff7aec24b834343ff433125f469886a3 (diff)
parent48015b632f770c401f3816f144499a39f2884677 (diff)
downloadlinux-878409ecde7c89c9f3db76ff1ef9486c6ceed02c.tar.bz2
Merge tag 'powerpc-5.17-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fix from Michael Ellerman: "Fix STACKTRACE=n build, in particular for skiroot_defconfig" * tag 'powerpc-5.17-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc: Fix STACKTRACE=n build
-rw-r--r--arch/powerpc/include/asm/nmi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/nmi.h b/arch/powerpc/include/asm/nmi.h
index 160abcb8e9fa..ea0e487f87b1 100644
--- a/arch/powerpc/include/asm/nmi.h
+++ b/arch/powerpc/include/asm/nmi.h
@@ -9,7 +9,7 @@ long soft_nmi_interrupt(struct pt_regs *regs);
static inline void arch_touch_nmi_watchdog(void) {}
#endif
-#if defined(CONFIG_NMI_IPI) && defined(CONFIG_STACKTRACE)
+#ifdef CONFIG_NMI_IPI
extern void arch_trigger_cpumask_backtrace(const cpumask_t *mask,
bool exclude_self);
#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace