Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93285c01 authored by Zhenzhong Duan's avatar Zhenzhong Duan Committed by Jonathan Corbet
Browse files

doc: kernel-parameters.txt: fix documentation of nmi_watchdog parameter 



The default behavior of hardlockup depends on the config of
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC.

Fix the description of nmi_watchdog to make it clear.

Suggested-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: default avatarZhenzhong Duan <zhenzhong.duan@oracle.com>
Reviewed-by: default avatarJoel Fernandes (Google) <joel@joelfernandes.org>
Acked-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Kees Cook <keescook@chromium.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-doc@vger.kernel.org
Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
parent fe4ec72c

Documentation/admin-guide/kernel-parameters.txt

+3 −2
Original line number Diff line number Diff line
@@ -2836,8 +2836,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.