> From: Peter Zijlstra [mailto:peterz@xxxxxxxxxxxxx] > > On Thu, Aug 06, 2015 at 02:45:43PM +0900, Hidehiro Kawai wrote: > > diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c > > index d05bd2e..dcd4038 100644 > > --- 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"); > > > > What tree is this again.. my tree (-tip) doesn't have > panic_on_unrecovered_nmi nonsense. I created this patch set on top of the v4.2-rc5, but this is mostly related to x86 and should be based on -tip tree. I'll do rebase in the next version. Regards, Hidehiro Kawai Hitachi, Ltd. Research & Development Group ��.n��������+%������w��{.n�����{����* jg��� �����ݢj����G���� ���j:+v���w�m������w�������h�����٥
