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 6/6] docs: document panic fully in sysctl/kernel.rst
Date: Thu, 13 Feb 2020 18:47:01 +0100 [thread overview]
Message-ID: <20200213174701.3200366-7-steve@sk2.org> (raw)
In-Reply-To: <20200213174701.3200366-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).
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 a792345ac6db..7ee4685861ea 100644
--- a/Documentation/admin-guide/sysctl/kernel.rst
+++ b/Documentation/admin-guide/sysctl/kernel.rst
@@ -562,9 +562,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.24.1
prev parent reply other threads:[~2020-02-13 20:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-13 17:46 [PATCH 0/6] docs: sysctl/kernel.rst rework Stephen Kitt
2020-02-13 17:46 ` [PATCH 1/6] docs: pretty up sysctl/kernel.rst Stephen Kitt
2020-02-13 18:52 ` Jonathan Corbet
2020-02-13 19:21 ` Stephen Kitt
2020-02-13 17:46 ` [PATCH 2/6] docs: merge debugging-modules.txt into sysctl/kernel.rst Stephen Kitt
2020-02-13 18:55 ` Jonathan Corbet
2020-02-13 17:46 ` [PATCH 3/6] docs: drop l2cr from sysctl/kernel.rst Stephen Kitt
2020-02-13 17:46 ` [PATCH 4/6] docs: add missing IPC documentation in sysctl/kernel.rst Stephen Kitt
2020-02-13 17:47 ` [PATCH 5/6] docs: document stop-a " Stephen Kitt
2020-02-13 17:47 ` Stephen Kitt [this message]
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=20200213174701.3200366-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