From: Li Zefan <lizefan@huawei.com>
To: Ingo Molnar <mingo@kernel.org>
Cc: Don Zickus <dzickus@redhat.com>, LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 1/3] watchdog: Disallow setting watchdog_thresh to -1
Date: Fri, 17 May 2013 10:31:04 +0800 [thread overview]
Message-ID: <51959668.9040106@huawei.com> (raw)
In old kernels, it's allowed to set softlockup_thresh to -1 or 0
to disable softlockup detection. However watchdog_thresh only
uses 0 to disable detection, and setting it to -1 just froze my
box and nothing I can do but reboot.
Signed-off-by: Li Zefan <lizefan@huawei.com>
---
kernel/sysctl.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 9edcf45..b0a1f99 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -120,7 +120,6 @@ extern int blk_iopoll_enabled;
/* Constants used for minimum and maximum */
#ifdef CONFIG_LOCKUP_DETECTOR
static int sixty = 60;
-static int neg_one = -1;
#endif
static int zero;
@@ -814,7 +813,7 @@ static struct ctl_table kern_table[] = {
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dowatchdog,
- .extra1 = &neg_one,
+ .extra1 = &zero,
.extra2 = &sixty,
},
{
--
1.8.0.2
next reply other threads:[~2013-05-17 2:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-17 2:31 Li Zefan [this message]
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:perf/core] " tip-bot for Li Zefan
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=51959668.9040106@huawei.com \
--to=lizefan@huawei.com \
--cc=dzickus@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
/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