diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2014-06-30 16:17:48 +0200 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2014-06-30 16:17:48 +0200 |
| commit | 20707b0fb4cde6e011c20699d0d7a9a9f9df22c3 (patch) | |
| tree | 9852a74da41a1b6393343c3a1a1f500d5a33ad53 /kernel | |
| parent | 407caec80cbdb122b42ddcd55fa337a21004c5c2 (diff) | |
| parent | 774e1e67ef51e643e0415baddcbd26f4d44e3270 (diff) | |
Merge tag 'v3.14.3' into v3.14-rt
This is the 3.14.3 stable release
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sysctl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 49e13e1f8fe6..aae21e842918 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -144,6 +144,11 @@ static int min_percpu_pagelist_fract = 8; static int ngroups_max = NGROUPS_MAX; static const int cap_last_cap = CAP_LAST_CAP; +/*this is needed for proc_doulongvec_minmax of sysctl_hung_task_timeout_secs */ +#ifdef CONFIG_DETECT_HUNG_TASK +static unsigned long hung_task_timeout_max = (LONG_MAX/HZ); +#endif + #ifdef CONFIG_INOTIFY_USER #include <linux/inotify.h> #endif @@ -995,6 +1000,7 @@ static struct ctl_table kern_table[] = { .maxlen = sizeof(unsigned long), .mode = 0644, .proc_handler = proc_dohung_task_timeout_secs, + .extra2 = &hung_task_timeout_max, }, { .procname = "hung_task_warnings", |