From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933230AbbLSKPw (ORCPT ); Sat, 19 Dec 2015 05:15:52 -0500 Received: from terminus.zytor.com ([198.137.202.10]:36621 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932831AbbLSKPt (ORCPT ); Sat, 19 Dec 2015 05:15:49 -0500 Date: Sat, 19 Dec 2015 02:14:25 -0800 From: tip-bot for Hidehiro Kawai Message-ID: Cc: vgoyal@redhat.com, linux-kernel@vger.kernel.org, bp@alien8.de, uobergfe@redhat.com, bp@suse.de, x86@kernel.org, rostedt@goodmis.org, hpa@zytor.com, nicolas.iooss_linux@m4x.org, masami.hiramatsu.pt@hitachi.com, xypron.glpk@gmx.de, peterz@infradead.org, cmetcalf@ezchip.com, mhocko@kernel.org, sjenning@redhat.com, corbet@lwn.net, manfred@colorfullife.com, hidehiro.kawai.ez@hitachi.com, tglx@linutronix.de, bhe@redhat.com, dzickus@redhat.com, ebiederm@xmission.com, mingo@kernel.org, jkosina@suse.cz, akpm@linux-foundation.org Reply-To: bhe@redhat.com, dzickus@redhat.com, tglx@linutronix.de, akpm@linux-foundation.org, jkosina@suse.cz, mingo@kernel.org, ebiederm@xmission.com, sjenning@redhat.com, cmetcalf@ezchip.com, xypron.glpk@gmx.de, mhocko@kernel.org, peterz@infradead.org, nicolas.iooss_linux@m4x.org, masami.hiramatsu.pt@hitachi.com, hidehiro.kawai.ez@hitachi.com, manfred@colorfullife.com, corbet@lwn.net, rostedt@goodmis.org, hpa@zytor.com, bp@alien8.de, linux-kernel@vger.kernel.org, vgoyal@redhat.com, x86@kernel.org, bp@suse.de, uobergfe@redhat.com In-Reply-To: <20151210014637.25437.71903.stgit@softrs> References: <20151210014637.25437.71903.stgit@softrs> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] Documentation: Document kernel.panic_on_io_nmi sysctl Git-Commit-ID: 9f318e3fcb1d4c48c26e8ca2ff2a459b82f36a23 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 9f318e3fcb1d4c48c26e8ca2ff2a459b82f36a23 Gitweb: http://git.kernel.org/tip/9f318e3fcb1d4c48c26e8ca2ff2a459b82f36a23 Author: Hidehiro Kawai AuthorDate: Mon, 14 Dec 2015 11:19:14 +0100 Committer: Thomas Gleixner CommitDate: Sat, 19 Dec 2015 11:07:01 +0100 Documentation: Document kernel.panic_on_io_nmi sysctl kernel.panic_on_io_nmi sysctl was introduced by commit 5211a242d0cb ("x86: Add sysctl to allow panic on IOCK NMI error") but its documentation is missing. So, add it. Signed-off-by: Hidehiro Kawai Requested-by: Borislav Petkov Cc: Andrew Morton Cc: Baoquan He Cc: Chris Metcalf Cc: Don Zickus Cc: "Eric W. Biederman" Cc: Heinrich Schuchardt Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Jiri Kosina Cc: Jonathan Corbet Cc: kexec@lists.infradead.org Cc: linux-doc@vger.kernel.org Cc: Manfred Spraul Cc: Masami Hiramatsu Cc: Michal Hocko Cc: Nicolas Iooss Cc: Peter Zijlstra Cc: Seth Jennings Cc: Steven Rostedt Cc: Thomas Gleixner Cc: Ulrich Obergfell Cc: Vivek Goyal Cc: x86-ml Link: http://lkml.kernel.org/r/20151210014637.25437.71903.stgit@softrs Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner --- Documentation/sysctl/kernel.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt index af70d15..73c6b1e 100644 --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt @@ -551,6 +551,21 @@ the recommended setting is 60. ============================================================== +panic_on_io_nmi: + +Controls the kernel's behavior when a CPU receives an NMI caused by +an IO error. + +0: try to continue operation (default) + +1: panic immediately. The IO error triggered an NMI. This indicates a + serious system condition which could result in IO data corruption. + Rather than continuing, panicking might be a better choice. Some + servers issue this sort of NMI when the dump button is pushed, + and you can use this option to take a crash dump. + +============================================================== + panic_on_oops: Controls the kernel's behaviour when an oops or BUG is encountered.