summaryrefslogtreecommitdiffstats
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorLi Zefan <lizefan@huawei.com>2013-05-17 10:31:04 +0800
committerIngo Molnar <mingo@kernel.org>2013-05-28 11:28:18 +0200
commita6572f84c5b135d9b6df279ed3c8de028bd1edd9 (patch)
tree8555a23db262d55512bf1fc365c5be8ede427f10 /kernel/sysctl.c
parent1b45adcd9a503428e6de6b39bc6892d86c9c1d41 (diff)
downloadblackbird-op-linux-a6572f84c5b135d9b6df279ed3c8de028bd1edd9.tar.gz
blackbird-op-linux-a6572f84c5b135d9b6df279ed3c8de028bd1edd9.zip
watchdog: Disallow setting watchdog_thresh to -1
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> Acked-by: Don Zickus <dzickus@redhat.com> Link: http://lkml.kernel.org/r/51959668.9040106@huawei.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 9edcf456e0fc..b0a1f99907f3 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,
},
{
OpenPOWER on IntegriCloud