Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752971AbbHVAqZ (ORCPT ); Fri, 21 Aug 2015 20:46:25 -0400 Received: from mail9.hitachi.co.jp ([133.145.228.44]:44805 "EHLO mail9.hitachi.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751452AbbHVAqX (ORCPT ); Fri, 21 Aug 2015 20:46:23 -0400 From: =?utf-8?B?5rKz5ZCI6Iux5a6PIC8gS0FXQUnvvIxISURFSElSTw==?= To: "'Peter Zijlstra'" CC: Jonathan Corbet , Ingo Molnar , "Eric W. Biederman" , "H. Peter Anvin" , Andrew Morton , Thomas Gleixner , Vivek Goyal , "linux-doc@vger.kernel.org" , "x86@kernel.org" , "kexec@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Michal Hocko , Ingo Molnar , =?utf-8?B?5bmz5p2+6ZuF5bezIC8gSElSQU1BVFXvvIxNQVNBTUk=?= Subject: RE: [V3 PATCH 1/4] panic/x86: Fix re-entrance problem due to panic on NMI Thread-Topic: [V3 PATCH 1/4] panic/x86: Fix re-entrance problem due to panic on NMI Thread-Index: AQHQ0AtiO/WqIwjG4kydT31aF47Jqp4VDX0AgAI5EBA= Date: Sat, 22 Aug 2015 00:46:18 +0000 Message-ID: <04EAB7311EE43145B2D3536183D1A8445493C7D2@GSjpTKYDCembx31.service.hitachi.net> References: <20150806054543.25766.29590.stgit@softrs> <20150806054543.25766.84120.stgit@softrs> <20150820234500.GI3161@worktop.event.rightround.com> In-Reply-To: <20150820234500.GI3161@worktop.event.rightround.com> Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.198.220.34] Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id t7M0kTwp003043 Content-Length: 1054 Lines: 30 > From: Peter Zijlstra [mailto:peterz@infradead.org] > > 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?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m???? ????????I?