LKML Archive on
help / color / mirror / Atom feed
From: Zhenzhong Duan <>
	Zhenzhong Duan <>
Subject: [PATCH v3] doc: kernel-parameters.txt: fix documentation of nmi_watchdog parameter
Date: Tue, 21 May 2019 10:32:08 +0800	[thread overview]
Message-ID: <> (raw)

The default behavior of hardlockup depends on the config of

Fix the description of nmi_watchdog to make it clear.

Suggested-by: Steven Rostedt (VMware) <>
Signed-off-by: Zhenzhong Duan <>
Reviewed-by: Joel Fernandes (Google) <>
Acked-by: Ingo Molnar <>
Acked-by: Steven Rostedt (VMware) <>
Cc: Thomas Gleixner <>
Cc: Kees Cook <>
Cc: Greg Kroah-Hartman <>
 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
+			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.

             reply	other threads:[~2019-05-22  2:29 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-21  2:32 Zhenzhong Duan [this message]
2019-05-23 18:37 ` Steven Rostedt
2019-05-23 19:01   ` Jonathan Corbet

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
    --subject='Re: [PATCH v3] doc: kernel-parameters.txt: fix documentation of nmi_watchdog parameter' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).