[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-9f318e3fcb1d4c48c26e8ca2ff2a459b82f36a23@git.kernel.org>
Date: Sat, 19 Dec 2015 02:14:25 -0800
From: tip-bot for Hidehiro Kawai <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: vgoyal@...hat.com, linux-kernel@...r.kernel.org, bp@...en8.de,
uobergfe@...hat.com, bp@...e.de, x86@...nel.org,
rostedt@...dmis.org, hpa@...or.com, nicolas.iooss_linux@....org,
masami.hiramatsu.pt@...achi.com, xypron.glpk@....de,
peterz@...radead.org, cmetcalf@...hip.com, mhocko@...nel.org,
sjenning@...hat.com, corbet@....net, manfred@...orfullife.com,
hidehiro.kawai.ez@...achi.com, tglx@...utronix.de, bhe@...hat.com,
dzickus@...hat.com, ebiederm@...ssion.com, mingo@...nel.org,
jkosina@...e.cz, akpm@...ux-foundation.org
Subject: [tip:x86/apic] Documentation:
Document kernel.panic_on_io_nmi sysctl
Commit-ID: 9f318e3fcb1d4c48c26e8ca2ff2a459b82f36a23
Gitweb: http://git.kernel.org/tip/9f318e3fcb1d4c48c26e8ca2ff2a459b82f36a23
Author: Hidehiro Kawai <hidehiro.kawai.ez@...achi.com>
AuthorDate: Mon, 14 Dec 2015 11:19:14 +0100
Committer: Thomas Gleixner <tglx@...utronix.de>
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 <hidehiro.kawai.ez@...achi.com>
Requested-by: Borislav Petkov <bp@...en8.de>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Baoquan He <bhe@...hat.com>
Cc: Chris Metcalf <cmetcalf@...hip.com>
Cc: Don Zickus <dzickus@...hat.com>
Cc: "Eric W. Biederman" <ebiederm@...ssion.com>
Cc: Heinrich Schuchardt <xypron.glpk@....de>
Cc: "H. Peter Anvin" <hpa@...or.com>
Cc: Ingo Molnar <mingo@...nel.org>
Cc: Jiri Kosina <jkosina@...e.cz>
Cc: Jonathan Corbet <corbet@....net>
Cc: kexec@...ts.infradead.org
Cc: linux-doc@...r.kernel.org
Cc: Manfred Spraul <manfred@...orfullife.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@...achi.com>
Cc: Michal Hocko <mhocko@...nel.org>
Cc: Nicolas Iooss <nicolas.iooss_linux@....org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Seth Jennings <sjenning@...hat.com>
Cc: Steven Rostedt <rostedt@...dmis.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Ulrich Obergfell <uobergfe@...hat.com>
Cc: Vivek Goyal <vgoyal@...hat.com>
Cc: x86-ml <x86@...nel.org>
Link: http://lkml.kernel.org/r/20151210014637.25437.71903.stgit@softrs
Signed-off-by: Borislav Petkov <bp@...e.de>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists