From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Date: Fri, 21 Aug 2015 01:45:00 +0200 From: Peter Zijlstra Subject: Re: [V3 PATCH 1/4] panic/x86: Fix re-entrance problem due to panic on NMI Message-ID: <20150820234500.GI3161@worktop.event.rightround.com> References: <20150806054543.25766.29590.stgit@softrs> <20150806054543.25766.84120.stgit@softrs> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20150806054543.25766.84120.stgit@softrs> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: Hidehiro Kawai Cc: x86@kernel.org, Jonathan Corbet , linux-doc@vger.kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Michal Hocko , Ingo Molnar , Thomas Gleixner , "Eric W. Biederman" , "H. Peter Anvin" , Masami Hiramatsu , Andrew Morton , Ingo Molnar , Vivek Goyal 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. _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec