Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp6720678yba; Tue, 14 May 2019 12:22:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqyzhZqiAhsdkHMjmvZGatoE36DYkm/s/8kiWeN3B/vYeERjyS+/3ayYZAsL7hbb7UYTsxg6 X-Received: by 2002:a63:e52:: with SMTP id 18mr40468256pgo.3.1557861757809; Tue, 14 May 2019 12:22:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557861757; cv=none; d=google.com; s=arc-20160816; b=cS3xPmoCg6kkVjCAQxd1UNEdDK+b0SyjZijA+tmvHU4Of2/ZUWg+7yMR+XomJgneN+ 1niuG/Zlvms02r+OqMNL7DsTdKQlMvi2SSj+bHPi3zcysSLDqPHQwR3z2cwQ0F3+kMJR jDTZ636joJmaU5DzYNijPE526+cRJTKpBM5KtAwmsrUBTYdEFrq0DW6zKwo9PUjXnb1x hP6PA27KYJsebv4NmycHu8gmFE9DGl8ZeUtbJ40/0Nv3bQ0C30QRGMhe+PcPT6u87zwN cweiSLRPNsSZ9hDGRzquP5rS/yFwAcUz5RjS+Kla9HenUQ3vw6IG/HMHVCr+iUhCITX1 nacg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date; bh=JxL6xQFG7yr8mmZyn/9U11FEnBDk9pEG7cwXXDvvKHU=; b=rzmLOdqQZoM1/YVFlO7RbCUok6x8BwIZbtK0RMdof4G+otbmtoRe0wuS1CBeB/ftuj OeoEd/12NV5FYPbXZDdiDTP0FQDnhzNY0utTyOOJufzeJpuGJWiRjT64eqdXH9jIKFW2 zdboq+/W05Gt5wl7P44yMaVDfS6Ys+E00j2FvDLOfKZM7TybtpoLvrK92VbSQFRfYreH r2YVF7+Zbk1GWZg7IUSn4vJRStR+OygeKt2j3ASEdhePtiQ8SBCYGUaeUI+yH9KKVrAh sz8G5Rl9tuwKuoXgYwF7Ac9U5muals3LmuNppT9QOnefRrLpv6YkVy/Jfyirf8r6stbo PxIw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f184si24422837pfb.280.2019.05.14.12.22.21; Tue, 14 May 2019 12:22:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726221AbfENTVP (ORCPT + 99 others); Tue, 14 May 2019 15:21:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:41268 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726134AbfENTVP (ORCPT ); Tue, 14 May 2019 15:21:15 -0400 Received: from oasis.local.home (50-204-120-225-static.hfc.comcastbusiness.net [50.204.120.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D34662166E; Tue, 14 May 2019 19:21:13 +0000 (UTC) Date: Tue, 14 May 2019 15:21:13 -0400 From: Steven Rostedt To: Zhenzhong Duan Cc: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, paulmck@linux.ibm.com, josh@joshtriplett.org, mathieu.desnoyers@efficios.com, jiangshanlai@gmail.com, joel@joelfernandes.org, corbet@lwn.net, tglx@linutronix.de, mingo@kernel.org, gregkh@linuxfoundation.org, keescook@chromium.org, srinivas.eeda@oracle.com Subject: Re: [PATCH v2] doc: kernel-parameters.txt: fix documentation of nmi_watchdog parameter Message-ID: <20190514152113.336e6116@oasis.local.home> In-Reply-To: <1557632127-16717-1-git-send-email-zhenzhong.duan@oracle.com> References: <1557632127-16717-1-git-send-email-zhenzhong.duan@oracle.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 12 May 2019 11:35:27 +0800 Zhenzhong Duan 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 > Reviewed-by: Joel Fernandes (Google) > Cc: Steven Rostedt Perhaps it should have been: Suggested-by: Steven Rostedt (VMware) As the wording is what I suggested ;-) -- Steve > --- > 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.