From: Stephen Kitt <steve@sk2.org>
To: Jonathan Corbet <corbet@lwn.net>,
Mauro Carvalho Chehab <mchehab+samsung@kernel.org>,
linux-doc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Stephen Kitt <steve@sk2.org>
Subject: [PATCH v2 6/8] docs: document panic fully in sysctl/kernel.rst
Date: Tue, 18 Feb 2020 13:59:21 +0100 [thread overview]
Message-ID: <20200218125923.685-7-steve@sk2.org> (raw)
In-Reply-To: <20200218125923.685-1-steve@sk2.org>
The description of panic doesn’t cover all the supported scenarios;
this patch fixes that, describing the three possibilities (no reboot,
immediate reboot, reboot after a delay).
Based on the implementation in kernel/panic.c.
Signed-off-by: Stephen Kitt <steve@sk2.org>
---
Documentation/admin-guide/sysctl/kernel.rst | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/Documentation/admin-guide/sysctl/kernel.rst b/Documentation/admin-guide/sysctl/kernel.rst
index 795d8e695f50..a67c218c4066 100644
--- a/Documentation/admin-guide/sysctl/kernel.rst
+++ b/Documentation/admin-guide/sysctl/kernel.rst
@@ -558,9 +558,15 @@ The default is 65534.
panic
=====
-The value in this file represents the number of seconds the kernel
-waits before rebooting on a panic. When you use the software watchdog,
-the recommended setting is 60.
+The value in this file determines the behaviour of the kernel on a
+panic:
+
+* if zero, the kernel will loop forever;
+* if negative, the kernel will reboot immediately;
+* if positive, the kernel will reboot after the corresponding number
+ of seconds.
+
+When you use the software watchdog, the recommended setting is 60.
panic_on_io_nmi
--
2.20.1
next prev parent reply other threads:[~2020-02-18 13:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-18 12:59 [PATCH v2 0/8] docs: sysctl/kernel.rst rework Stephen Kitt
2020-02-18 12:59 ` [PATCH v2 1/8] docs: pretty up sysctl/kernel.rst Stephen Kitt
2020-02-18 12:59 ` [PATCH v2 2/8] docs: merge debugging-modules.txt into sysctl/kernel.rst Stephen Kitt
2020-02-18 12:59 ` [PATCH v2 3/8] docs: drop l2cr from sysctl/kernel.rst Stephen Kitt
2020-02-18 12:59 ` [PATCH v2 4/8] docs: add missing IPC documentation in sysctl/kernel.rst Stephen Kitt
2020-02-18 12:59 ` [PATCH v2 5/8] docs: document stop-a " Stephen Kitt
2020-02-18 12:59 ` Stephen Kitt [this message]
2020-02-18 12:59 ` [PATCH v2 7/8] docs: add a script to check sysctl docs Stephen Kitt
2020-02-19 10:44 ` Jonathan Corbet
2020-02-19 15:25 ` Stephen Kitt
2020-02-19 17:33 ` Jonathan Corbet
2020-02-18 12:59 ` [PATCH v2 8/8] docs: sysctl/kernel: remove rtsig entries Stephen Kitt
2020-02-19 10:45 ` [PATCH v2 0/8] docs: sysctl/kernel.rst rework Jonathan Corbet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200218125923.685-7-steve@sk2.org \
--to=steve@sk2.org \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab+samsung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome