merged to all branches. Bruce
On Sun, Apr 28, 2019 at 6:53 AM He Zhe <[email protected]> wrote: > This is for all branches from 4.19 to 5.0. > > Zhe > > On 4/28/19 6:52 PM, [email protected] wrote: > > From: He Zhe <[email protected]> > > > > b470fb994ebd ("tracing/x86: Save CR2 before tracing irqsoff on > error_entry") > > misses a "#ifdef". > > > > Signed-off-by: He Zhe <[email protected]> > > --- > > arch/x86/entry/common.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c > > index 48a0a59..56d54d30 100644 > > --- a/arch/x86/entry/common.c > > +++ b/arch/x86/entry/common.c > > @@ -308,6 +308,7 @@ __visible void do_syscall_64(unsigned long nr, > struct pt_regs *regs) > > syscall_return_slowpath(regs); > > } > > > > +#ifdef CONFIG_TRACE_IRQFLAGS > > extern void trace_hardirqs_on_caller(unsigned long caller_addr); > > __visible void trace_hardirqs_on_caller_cr2(unsigned long caller_addr) > > { > > @@ -334,6 +335,7 @@ __visible void > trace_hardirqs_off_caller_cr2(unsigned long caller_addr) > > exception_exit(prev_state); > > } > > #endif > > +#endif > > > > #if defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION) > > /* > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-- _______________________________________________ linux-yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/linux-yocto
