Received: by 2002:a25:86ce:0:0:0:0:0 with SMTP id y14csp1689267ybm; Tue, 21 May 2019 19:31:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqzOEGqfVseYhedCtoCR2GtUxZxGe4A2qjoy/+d3Pess4Vw/g9eSJkzEULIiBnBqPp49MTfM X-Received: by 2002:a17:902:e28a:: with SMTP id cf10mr85850980plb.77.1558492284555; Tue, 21 May 2019 19:31:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558492284; cv=none; d=google.com; s=arc-20160816; b=jnTWruZT9FvKc7i31dlyj9g4fBkNoc9EXq3TeD2hB6lzagAlgqm6nKtePp3leR9r8O onWjQ6tjUq0pRS9WeKE08GCfG4korY8COyI3PcLE/WIXGT4sTxCQzCDIEfe4OxlxUI5l UgalPMpygHmdaHj8aSs2rkv4/KjNcWLP/AA+os/kaBC3wQ74GpCpehXa8D1tBHcQtOXi XGXRaC6Ga6Slup8rxorujAe5S7F5wT0/XkyYb0QScUoVatlGRJlUu4ecRBfGBMCjnoB1 tK2PB0I8g39t+1+5l1Vgxq+R04bkncR4eQOltjxXhmgpWo8b0p0jyyRq9D5AxhdBcFoE FBYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=ZXUeQYgZB3O0V7HnlxDvOw49BMFt48EfbIn16aNTl/g=; b=vZF952zvVjM0o0G+4jmVli2ZAZU2ctSwDKezGDGqbQoO1ElRCGPyFJ0bdcbSEg1Xpk U1vjcYnraF7wTxLKdj80RgNAbIs1PHLYoLX2u/y6n9NcLXf3dSLWZ6eUETRaTWU9Ihxy fDKx2mkrDKZsxkCiGOq0ggxDimMZaSKqFI6VzmDKGGrhQld1gomodYLwyYrDycCAs1OU ReOK7toriqnsaAT8mbc9MS+ff/YRIS9W+LA+T9P8yZy4ZVA9mVq5WEyQ5iiz1CR3bKtK O3KU0MPMXlR9qnu4XDtMJGHRHWscLUa8yn5+0TeG/ku28YNL4XFNya983acugwzzHVyd sWxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=pzLjNCWj; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r204si25684351pfc.263.2019.05.21.19.31.06; Tue, 21 May 2019 19:31:24 -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; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=pzLjNCWj; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728175AbfEVC34 (ORCPT + 99 others); Tue, 21 May 2019 22:29:56 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:42324 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726466AbfEVC34 (ORCPT ); Tue, 21 May 2019 22:29:56 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x4M2T0FR038593; Wed, 22 May 2019 02:29:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id; s=corp-2018-07-02; bh=ZXUeQYgZB3O0V7HnlxDvOw49BMFt48EfbIn16aNTl/g=; b=pzLjNCWji1W1SDF9Bw9C/ZEezK9tc+A83lNgJZbqCd02orKUVbRCZ6qlapXr3wUJEjWW yLGMlFypDraEnHBeGQ9uzFJpoLUMciJGWWBWytfD26rCDCEcH8OtgPkLg0im6fI+cWt3 BqvzhIaHlvsiXoPR/KNtJt/gJM/M5STmS02611bN5GjX6Hv1LQV2EW3iIZMRQHL2irDk WLTKbu8N2tA/IOBxz44m/x7nNsoV0lGg4Oe5Rs83FF9aYup0Z8N0NR0QmTUNlDDo5InV +f0mDTzN3f6jUNTmvXopZ2NJCKyUsy9y39NETflGe5gjn9l1Se6pqsc/++3Mc0ZI66xL BA== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by userp2130.oracle.com with ESMTP id 2smsk58rtk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 22 May 2019 02:29:00 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x4M2SDh1017840; Wed, 22 May 2019 02:28:59 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserp3030.oracle.com with ESMTP id 2smsgsawm3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 22 May 2019 02:28:59 +0000 Received: from abhmp0019.oracle.com (abhmp0019.oracle.com [141.146.116.25]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x4M2SphF018805; Wed, 22 May 2019 02:28:51 GMT Received: from z2.cn.oracle.com (/10.182.69.87) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 22 May 2019 02:28:50 +0000 From: Zhenzhong Duan To: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org Cc: paulmck@linux.ibm.com, josh@joshtriplett.org, rostedt@goodmis.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, Zhenzhong Duan Subject: [PATCH v3] doc: kernel-parameters.txt: fix documentation of nmi_watchdog parameter Date: Tue, 21 May 2019 10:32:08 +0800 Message-Id: <1558405928-29449-1-git-send-email-zhenzhong.duan@oracle.com> X-Mailer: git-send-email 1.8.3.1 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9264 signatures=668687 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905220015 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9264 signatures=668687 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905220015 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: 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 Cc: linux-doc@vger.kernel.org --- 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. -- 1.8.3.1