On Tue, 21 May 2019 10:32:08 +0800 Zhenzhong Duan <zhenzhong.duan@xxxxxxxxxx> 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 > Fix the description of nmi_watchdog to make it clear. > > Suggested-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx> > Signed-off-by: Zhenzhong Duan <zhenzhong.duan@xxxxxxxxxx> > Reviewed-by: Joel Fernandes (Google) <joel@xxxxxxxxxxxxxxxxx> > Acked-by: Ingo Molnar <mingo@xxxxxxxxxx> > Acked-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx> > Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > Cc: Kees Cook <keescook@xxxxxxxxxxxx> > Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > Cc: linux-doc@xxxxxxxxxxxxxxx > --- > 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.
