diff options
| author | Linus Torvalds <[email protected]> | 2022-03-11 19:50:36 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2022-03-11 19:50:36 +0000 |
| commit | 878409ecde7c89c9f3db76ff1ef9486c6ceed02c (patch) | |
| tree | d1acf71dccf177865559138dca81e583932535a7 | |
| parent | ARM: fix Thumb2 regression with Spectre BHB (diff) | |
| parent | powerpc: Fix STACKTRACE=n build (diff) | |
| download | kernel-878409ecde7c89c9f3db76ff1ef9486c6ceed02c.tar.gz kernel-878409ecde7c89c9f3db76ff1ef9486c6ceed02c.zip | |
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.h | 2 |
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 |