On Wed, Feb 26, 2020 at 11:25:09AM +0100, Peter Zijlstra wrote: > Subject: sh/ftrace: Move arch_ftrace_nmi_{enter,exit} into nmi exception > From: Peter Zijlstra <peterz@xxxxxxxxxxxxx> > Date: Mon Feb 24 22:26:21 CET 2020 > > SuperH is the last remaining user of arch_ftrace_nmi_{enter,exit}(), > remove it from the generic code and into the SuperH code. > > Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> > --- > --- a/arch/sh/kernel/traps.c > +++ b/arch/sh/kernel/traps.c > @@ -170,11 +170,21 @@ BUILD_TRAP_HANDLER(bug) > force_sig(SIGTRAP); > } > > +#ifdef CONFIG_HAVE_DYNAMIC_FTRACE build robot just informed me that this ought to s/HAVE_// > +extern void arch_ftrace_nmi_enter(void); > +extern void arch_ftrace_nmi_exit(void); > +#else > +static inline void arch_ftrace_nmi_enter(void) { } > +static inline void arch_ftrace_nmi_exit(void) { } > +#endif