* Zhenzhong Duan <zhenzhong.d...@oracle.com> wrote:
> The default behavior of hardlockup depends on the config of
> CONFIG_BOOTPARAM_HARDLOCKUP_PANIC.
>
> Fix the description of nmi_watchdog to make it clear.
>
> Signed-off-by: Zhenzhong Duan <zhenzhong.d...@oracle.com>
> Reviewed-by: Joel Fernandes (Google) <j...@joelfernandes.org>
> Cc: Steven Rostedt <rost...@goodmis.org>
> ---
> 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.
Acked-by: Ingo Molnar <mi...@kernel.org>
Thanks,
Ingo
