git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core-watchdog-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
kernel
/
sysctl.c
diff --git
a/kernel/sysctl.c
b/kernel/sysctl.c
index 6648fbbb8157fc12703d02fa0fdc9ff85c527ac4..d9c31bc2eaea2c95a7a7be5a5321700b84d8f640 100644
(file)
--- a/
kernel/sysctl.c
+++ b/
kernel/sysctl.c
@@
-367,7
+367,8
@@
static struct ctl_table kern_table[] = {
.data = &sysctl_sched_time_avg,
.maxlen = sizeof(unsigned int),
.mode = 0644,
.data = &sysctl_sched_time_avg,
.maxlen = sizeof(unsigned int),
.mode = 0644,
- .proc_handler = proc_dointvec,
+ .proc_handler = proc_dointvec_minmax,
+ .extra1 = &one,
},
#ifdef CONFIG_SCHEDSTATS
{
},
#ifdef CONFIG_SCHEDSTATS
{
@@
-871,9
+872,9
@@
static struct ctl_table kern_table[] = {
#if defined(CONFIG_LOCKUP_DETECTOR)
{
.procname = "watchdog",
#if defined(CONFIG_LOCKUP_DETECTOR)
{
.procname = "watchdog",
- .data = &watchdog_user_enabled,
- .maxlen = sizeof
(int),
- .mode = 0644,
+ .data = &watchdog_user_enabled,
+ .maxlen = sizeof(int),
+ .mode = 0644,
.proc_handler = proc_watchdog,
.extra1 = &zero,
.extra2 = &one,
.proc_handler = proc_watchdog,
.extra1 = &zero,
.extra2 = &one,
@@
-889,16
+890,12
@@
static struct ctl_table kern_table[] = {
},
{
.procname = "nmi_watchdog",
},
{
.procname = "nmi_watchdog",
- .data = &nmi_watchdog_enabled,
- .maxlen = sizeof
(int),
- .mode =
0644
,
+ .data = &nmi_watchdog_
user_
enabled,
+ .maxlen = sizeof(int),
+ .mode =
NMI_WATCHDOG_SYSCTL_PERM
,
.proc_handler = proc_nmi_watchdog,
.extra1 = &zero,
.proc_handler = proc_nmi_watchdog,
.extra1 = &zero,
-#if defined(CONFIG_HAVE_NMI_WATCHDOG) || defined(CONFIG_HARDLOCKUP_DETECTOR)
.extra2 = &one,
.extra2 = &one,
-#else
- .extra2 = &zero,
-#endif
},
{
.procname = "watchdog_cpumask",
},
{
.procname = "watchdog_cpumask",
@@
-910,9
+907,9
@@
static struct ctl_table kern_table[] = {
#ifdef CONFIG_SOFTLOCKUP_DETECTOR
{
.procname = "soft_watchdog",
#ifdef CONFIG_SOFTLOCKUP_DETECTOR
{
.procname = "soft_watchdog",
- .data = &soft_watchdog_enabled,
- .maxlen = sizeof
(int),
- .mode = 0644,
+ .data = &soft_watchdog_
user_
enabled,
+ .maxlen = sizeof(int),
+ .mode = 0644,
.proc_handler = proc_soft_watchdog,
.extra1 = &zero,
.extra2 = &one,
.proc_handler = proc_soft_watchdog,
.extra1 = &zero,
.extra2 = &one,
@@
-2185,8
+2182,6
@@
static int do_proc_douintvec_conv(unsigned long *lvalp,
int write, void *data)
{
if (write) {
int write, void *data)
{
if (write) {
- if (*lvalp > UINT_MAX)
- return -EINVAL;
if (*lvalp > UINT_MAX)
return -EINVAL;
*valp = *lvalp;
if (*lvalp > UINT_MAX)
return -EINVAL;
*valp = *lvalp;