Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6: (43 commits) security/tomoyo: Remove now unnecessary handling of security_sysctl. security/tomoyo: Add a special case to handle accesses through the internal proc mount. sysctl: Drop & in front of every proc_handler. sysctl: Remove CTL_NONE and CTL_UNNUMBERED sysctl: kill dead ctl_handler definitions. sysctl: Remove the last of the generic binary sysctl support sysctl net: Remove unused binary sysctl code sysctl security/tomoyo: Don't look at ctl_name sysctl arm: Remove binary sysctl support sysctl x86: Remove dead binary sysctl support sysctl sh: Remove dead binary sysctl support sysctl powerpc: Remove dead binary sysctl support sysctl ia64: Remove dead binary sysctl support sysctl s390: Remove dead sysctl binary support sysctl frv: Remove dead binary sysctl support sysctl mips/lasat: Remove dead binary sysctl support sysctl drivers: Remove dead binary sysctl support sysctl crypto: Remove dead binary sysctl support sysctl security/keys: Remove dead binary sysctl support sysctl kernel: Remove binary sysctl logic ...
This commit is contained in:
@@ -49,7 +49,6 @@ static const int slow_work_max_vslow = 99;
|
||||
|
||||
ctl_table slow_work_sysctls[] = {
|
||||
{
|
||||
.ctl_name = CTL_UNNUMBERED,
|
||||
.procname = "min-threads",
|
||||
.data = &slow_work_min_threads,
|
||||
.maxlen = sizeof(unsigned),
|
||||
@@ -59,7 +58,6 @@ ctl_table slow_work_sysctls[] = {
|
||||
.extra2 = &slow_work_max_threads,
|
||||
},
|
||||
{
|
||||
.ctl_name = CTL_UNNUMBERED,
|
||||
.procname = "max-threads",
|
||||
.data = &slow_work_max_threads,
|
||||
.maxlen = sizeof(unsigned),
|
||||
@@ -69,16 +67,15 @@ ctl_table slow_work_sysctls[] = {
|
||||
.extra2 = (void *) &slow_work_max_max_threads,
|
||||
},
|
||||
{
|
||||
.ctl_name = CTL_UNNUMBERED,
|
||||
.procname = "vslow-percentage",
|
||||
.data = &vslow_work_proportion,
|
||||
.maxlen = sizeof(unsigned),
|
||||
.mode = 0644,
|
||||
.proc_handler = &proc_dointvec_minmax,
|
||||
.proc_handler = proc_dointvec_minmax,
|
||||
.extra1 = (void *) &slow_work_min_vslow,
|
||||
.extra2 = (void *) &slow_work_max_vslow,
|
||||
},
|
||||
{ .ctl_name = 0 }
|
||||
{}
|
||||
};
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user