Re: [PATCH v3] doc: kernel-parameters.txt: fix documentation of nmi_watchdog parameter
From: Steven Rostedt <rostedt@goodmis.org>
Date: 2019-05-23 18:37:08
Also in:
lkml
On Tue, 21 May 2019 10:32:08 +0800 Zhenzhong Duan [off-list ref] wrote:
The default behavior of hardlockup depends on the config of CONFIG_BOOTPARAM_HARDLOCKUP_PANIC.
Jon, You want to take this in your tree? -- Steve
quoted hunk ↗ jump to hunk
Fix the description of nmi_watchdog to make it clear. Suggested-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by: Zhenzhong Duan <redacted> Reviewed-by: Joel Fernandes (Google) <redacted> Acked-by: Ingo Molnar <mingo@kernel.org> Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Cc: Thomas Gleixner <redacted> Cc: Kees Cook <redacted> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-doc@vger.kernel.org --- v3: add Suggested-by and Acked-by v2: fix description using words suggested by Steven Rostedt Documentation/admin-guide/kernel-parameters.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 08df588..b9d4358 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt@@ -2805,8 +2805,9 @@ 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). To disable both hard and soft lockup detectors, + timeout occurs (or 'nopanic' to not panic on an NMI + watchdog, if CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is set) + 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.