diff options
| author | Pranith Kumar <bobby.prani@gmail.com> | 2015-10-10 15:40:42 -0400 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2015-10-11 15:41:16 -0600 |
| commit | 334bb79c18eb8c1a314536b4b347ecab97d25d93 (patch) | |
| tree | 52582800dc9eb1edc48efc661a810ca44600538c /Documentation/kernel-parameters.txt | |
| parent | 0ea1563bc108408083f2ac6dc38d7b8992e5b819 (diff) | |
| download | linux-334bb79c18eb8c1a314536b4b347ecab97d25d93.tar.gz | |
doc: Clarify that nmi_watchdog param is for hardlockups
The kernel NMI watchdog acts as both a hardlockup and softlockup detector.
However, the kernel parameter nmi_watchdog can only enable or disable the
hardlockup detector. Clarify that in the documentation.
Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 7a01cc0b0b3122..f97071ac9b4ce7 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -2320,11 +2320,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. nmi_watchdog= [KNL,BUGS=X86] Debugging features for SMP kernels Format: [panic,][nopanic,][num] Valid num: 0 or 1 - 0 - turn nmi_watchdog off - 1 - turn nmi_watchdog on + 0 - turn hardlockup detector in nmi_watchdog off + 1 - turn hardlockup detector in nmi_watchdog on When panic is specified, panic when an NMI watchdog timeout occurs (or 'nopanic' to override the opposite - default). + default). To disable both hard and soft lockup detectors, + please see 'nowatchdog'. This is useful when you use a panic=... timeout and need the box quickly up again. |