On Fri, Sep 25, 2015 at 12:13:55PM +0000, 河合英宏 / KAWAI,HIDEHIRO wrote: > Peter saids -tip tree doesn't have panic_on_unrecovered_nmi in the > previoius discussion, but it still exists. So, I didn't change > anything about panic_on_unrecovered_nmi. >
> > --- a/arch/x86/kernel/nmi.c > > +++ b/arch/x86/kernel/nmi.c > > @@ -231,7 +231,7 @@ void unregister_nmi_handler(unsigned int type, const > > char *name) > > #endif > > > > if (panic_on_unrecovered_nmi) > > - panic("NMI: Not continuing"); > > + nmi_panic("NMI: Not continuing"); > > > > pr_emerg("Dazed and confused, but trying to continue\n"); > > I was looking at unregister_nmi_handler() because that's the function the diff points to. That still doesn't have panic_on_unrecovered_nmi. It looks like your diff tool is 'broken' and generates nonsense function data. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/