From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753550AbbLJBt0 (ORCPT ); Wed, 9 Dec 2015 20:49:26 -0500 Received: from mail9.hitachi.co.jp ([133.145.228.44]:41554 "EHLO mail9.hitachi.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751996AbbLJBtW (ORCPT ); Wed, 9 Dec 2015 20:49:22 -0500 X-AuditID: 85900ec0-9c3c7b9000001a57-d6-5668da1e0c02 X-Mailbox-Line: From nobody Thu Dec 10 10:46:37 2015 Subject: [V6 PATCH 6/6] Documentation: Add documentation for kernel.panic_on_io_nmi sysctl To: Jonathan Corbet , Peter Zijlstra , Ingo Molnar , "Eric W. Biederman" , "H. Peter Anvin" , Andrew Morton , Thomas Gleixner , Vivek Goyal From: Hidehiro Kawai Cc: Baoquan He , linux-doc@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Steven Rostedt , Michal Hocko , Borislav Petkov , Masami Hiramatsu Date: Thu, 10 Dec 2015 10:46:37 +0900 Message-ID: <20151210014637.25437.71903.stgit@softrs> In-Reply-To: <20151210014624.25437.50028.stgit@softrs> References: <20151210014624.25437.50028.stgit@softrs> User-Agent: StGit/0.16 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. V6: - Newly added Signed-off-by: Hidehiro Kawai Cc: Jonathan Corbet Cc: Andrew Morton --- Documentation/sysctl/kernel.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt index af70d15..235f804 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 NMI 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.