summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Kitt <steve@sk2.org>2020-02-18 13:59:21 +0100
committerJonathan Corbet <corbet@lwn.net>2020-02-19 03:34:37 -0700
commit404347e68aeb81b89dc440135ed23fcabff104f9 (patch)
treed5b344920da0d8aa97986ffa7db7cf54bec9b1f6
parenta1ad4f15054b58636aa58f0df2961259f8781746 (diff)
downloadlwn-404347e68aeb81b89dc440135ed23fcabff104f9.tar.gz
lwn-404347e68aeb81b89dc440135ed23fcabff104f9.zip
docs: document panic fully in sysctl/kernel.rst
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> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-rw-r--r--Documentation/admin-guide/sysctl/kernel.rst12
1 files changed, 9 insertions, 3 deletions
diff --git a/Documentation/admin-guide/sysctl/kernel.rst b/Documentation/admin-guide/sysctl/kernel.rst
index 3cbbe4502e18..60c97a79ff26 100644
--- a/Documentation/admin-guide/sysctl/kernel.rst
+++ b/Documentation/admin-guide/sysctl/kernel.rst
@@ -559,9 +559,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