diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 15:43:54 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 15:43:54 +0200 |
| commit | b160292cc216a50fd0cd386b0bda2cd48352c73b (patch) | |
| tree | ef07cf98f91353ee4c9ec1e1ca7a2a5d9d4b538a /kernel/sysctl.c | |
| parent | [MTD] [NAND] Blackfin on-chip NAND Flash Controller driver (diff) | |
| parent | Linux 2.6.23 (diff) | |
| download | linux-b160292cc216a50fd0cd386b0bda2cd48352c73b.tar.xz linux-b160292cc216a50fd0cd386b0bda2cd48352c73b.zip | |
Merge Linux 2.6.23
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 41 |
1 files changed, 30 insertions, 11 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 9029690f4fae..53a456ebf6d5 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -222,8 +222,19 @@ static ctl_table kern_table[] = { #ifdef CONFIG_SCHED_DEBUG { .ctl_name = CTL_UNNUMBERED, - .procname = "sched_granularity_ns", - .data = &sysctl_sched_granularity, + .procname = "sched_min_granularity_ns", + .data = &sysctl_sched_min_granularity, + .maxlen = sizeof(unsigned int), + .mode = 0644, + .proc_handler = &proc_dointvec_minmax, + .strategy = &sysctl_intvec, + .extra1 = &min_sched_granularity_ns, + .extra2 = &max_sched_granularity_ns, + }, + { + .ctl_name = CTL_UNNUMBERED, + .procname = "sched_latency_ns", + .data = &sysctl_sched_latency, .maxlen = sizeof(unsigned int), .mode = 0644, .proc_handler = &proc_dointvec_minmax, @@ -283,6 +294,23 @@ static ctl_table kern_table[] = { .mode = 0644, .proc_handler = &proc_dointvec, }, + { + .ctl_name = CTL_UNNUMBERED, + .procname = "sched_features", + .data = &sysctl_sched_features, + .maxlen = sizeof(unsigned int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, +#endif + { + .ctl_name = CTL_UNNUMBERED, + .procname = "sched_compat_yield", + .data = &sysctl_sched_compat_yield, + .maxlen = sizeof(unsigned int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, #ifdef CONFIG_PROVE_LOCKING { .ctl_name = CTL_UNNUMBERED, @@ -304,15 +332,6 @@ static ctl_table kern_table[] = { }, #endif { - .ctl_name = CTL_UNNUMBERED, - .procname = "sched_features", - .data = &sysctl_sched_features, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = &proc_dointvec, - }, -#endif - { .ctl_name = KERN_PANIC, .procname = "panic", .data = &panic_timeout, |