public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Li Zefan <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
	tglx@linutronix.de, dzickus@redhat.com, lizefan@huawei.com
Subject: [tip:perf/core] watchdog: Remove softlockup_thresh from Documentation
Date: Tue, 28 May 2013 06:33:29 -0700	[thread overview]
Message-ID: <tip-c0ffaf3655fab1909a920c8f30ba1722932d01bb@git.kernel.org> (raw)
In-Reply-To: <51959687.9090305@huawei.com>

Commit-ID:  c0ffaf3655fab1909a920c8f30ba1722932d01bb
Gitweb:     http://git.kernel.org/tip/c0ffaf3655fab1909a920c8f30ba1722932d01bb
Author:     Li Zefan <lizefan@huawei.com>
AuthorDate: Fri, 17 May 2013 10:31:35 +0800
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 28 May 2013 11:28:20 +0200

watchdog: Remove softlockup_thresh from Documentation

The old softlockup detector has been replaced with new lockup
detector long ago.

Signed-off-by: Li Zefan <lizefan@huawei.com>
Acked-by: Don Zickus <dzickus@redhat.com>
Link: http://lkml.kernel.org/r/51959687.9090305@huawei.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 Documentation/sysctl/kernel.txt | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index e8fabd6..bcff3f9 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -70,7 +70,6 @@ show up in /proc/sys/kernel:
 - shmall
 - shmmax                      [ sysv ipc ]
 - shmmni
-- softlockup_thresh
 - stop-a                      [ SPARC only ]
 - sysrq                       ==> Documentation/sysrq.txt
 - tainted
@@ -605,15 +604,6 @@ without users and with a dead originative process will be destroyed.
 
 ==============================================================
 
-softlockup_thresh:
-
-This value can be used to lower the softlockup tolerance threshold.  The
-default threshold is 60 seconds.  If a cpu is locked up for 60 seconds,
-the kernel complains.  Valid values are 1-60 seconds.  Setting this
-tunable to zero will disable the softlockup detection altogether.
-
-==============================================================
-
 tainted:
 
 Non-zero if the kernel has been tainted.  Numeric values, which

  parent reply	other threads:[~2013-05-28 13:33 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-17  2:31 [PATCH 1/3] watchdog: Disallow setting watchdog_thresh to -1 Li Zefan
2013-05-17  2:31 ` [PATCH 2/3] watchdog: Document watchdog_thresh sysctl Li Zefan
2013-05-17 13:07   ` Don Zickus
2013-05-28 13:32   ` [tip:perf/core] " tip-bot for Li Zefan
2013-05-17  2:31 ` [PATCH 3/3] watchdog: Remove softlockup_thresh from Documentation Li Zefan
2013-05-17 13:07   ` Don Zickus
2013-05-28 13:33   ` tip-bot for Li Zefan [this message]
2013-05-17 13:06 ` [PATCH 1/3] watchdog: Disallow setting watchdog_thresh to -1 Don Zickus
2013-05-28 13:30 ` [tip:perf/core] " tip-bot for Li Zefan

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:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

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

  git send-email \
    --in-reply-to=tip-c0ffaf3655fab1909a920c8f30ba1722932d01bb@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=dzickus@redhat.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox