RE: [V4 PATCH 1/4] panic/x86: Fix re-entrance problem due to panic on NMI

From: æåèå / KAWAIïHIDEHIRO
Date: Wed Sep 30 2015 - 21:02:53 EST


> 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.

I had noticed the function name is wrong, but I didn't know how
do I fix that, sorry. Now, I updated git to the latest version
and the issue disappeared.

Regards,

Hidehiro Kawai
Hitachi, Ltd. Research & Development Group