diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-14 10:11:02 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-14 10:11:02 -0400 |
commit | d14c8a680ccfdeb5e7b9be4d61162c2b373bd1e8 (patch) | |
tree | 38cead29b9b34b9d26b5cfe7b2c2673d6f7ac052 /kernel/sysctl.c | |
parent | d59fdcf2ac501de99c3dfb452af5e254d4342886 (diff) | |
parent | 873a6ed6288b6c2c0d2cc84d3b2bf2fab9ba0181 (diff) |
Merge branch 'sched/for-linus' into tracing/for-linus
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 29116652dca8..fe8cdc80ff02 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -266,6 +266,14 @@ static struct ctl_table kern_table[] = { | |||
266 | }, | 266 | }, |
267 | { | 267 | { |
268 | .ctl_name = CTL_UNNUMBERED, | 268 | .ctl_name = CTL_UNNUMBERED, |
269 | .procname = "sched_shares_ratelimit", | ||
270 | .data = &sysctl_sched_shares_ratelimit, | ||
271 | .maxlen = sizeof(unsigned int), | ||
272 | .mode = 0644, | ||
273 | .proc_handler = &proc_dointvec, | ||
274 | }, | ||
275 | { | ||
276 | .ctl_name = CTL_UNNUMBERED, | ||
269 | .procname = "sched_child_runs_first", | 277 | .procname = "sched_child_runs_first", |
270 | .data = &sysctl_sched_child_runs_first, | 278 | .data = &sysctl_sched_child_runs_first, |
271 | .maxlen = sizeof(unsigned int), | 279 | .maxlen = sizeof(unsigned int), |