summaryrefslogtreecommitdiffstats
path: root/Documentation/admin-guide/kernel-parameters.txt
diff options
context:
space:
mode:
authorScott Wood <swood@redhat.com>2017-12-10 08:48:46 +0100
committerJonathan Corbet <corbet@lwn.net>2017-12-11 22:55:29 +0100
commitd22881dc13b62baf32e69e16fd4f8bdbe2aa3e4e (patch)
tree1411cc1bd22d891b0bfae76042fb62c2ec3dadf4 /Documentation/admin-guide/kernel-parameters.txt
parentdoc: usb: chipidea: Fix typo in 'enumerate' (diff)
downloadlinux-d22881dc13b62baf32e69e16fd4f8bdbe2aa3e4e.tar.xz
linux-d22881dc13b62baf32e69e16fd4f8bdbe2aa3e4e.zip
Documentation: Better document the hardlockup_panic sysctl
Commit ac1f591249d95372f ("kernel/watchdog.c: add sysctl knob hardlockup_panic") added the hardlockup_panic sysctl, but did not add it to Documentation/sysctl/kernel.txt. Add this, and reference it from the corresponding entry in Documentation/admin-guide/kernel-parameters.txt. Signed-off-by: Scott Wood <swood@redhat.com> Acked-by: Christoph von Recklinghausen <crecklin@redhat.com> Acked-by: Don Zickus <dzickus@redhat.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'Documentation/admin-guide/kernel-parameters.txt')
-rw-r--r--Documentation/admin-guide/kernel-parameters.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 6571fbfdb2a1..dfb7c35b5826 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -2538,6 +2538,9 @@
This is useful when you use a panic=... timeout and
need the box quickly up again.
+ These settings can be accessed at runtime via
+ the nmi_watchdog and hardlockup_panic sysctls.
+
netpoll.carrier_timeout=
[NET] Specifies amount of time (in seconds) that
netpoll should wait for a carrier. By default netpoll