diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-19 18:47:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-19 18:47:59 -0400 |
| commit | 097cc62283455668ad0b35c72920c6373f45c2ab (patch) | |
| tree | 36555397fabe00d0519d24212f66b3817517eb82 /kernel/sysctl.c | |
| parent | 31e879309474d1666d645b96de99d0b682fa055f (diff) | |
| parent | 9c95e7319ba98585ebb6d304eca2d56f401ed70c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
sched: fix invalid sched_class use
sched: add /proc/sys/kernel/sched_compat_yield
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 6ace893c17c9..53a456ebf6d5 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -303,6 +303,14 @@ static ctl_table kern_table[] = { | |||
| 303 | .proc_handler = &proc_dointvec, | 303 | .proc_handler = &proc_dointvec, |
| 304 | }, | 304 | }, |
| 305 | #endif | 305 | #endif |
| 306 | { | ||
| 307 | .ctl_name = CTL_UNNUMBERED, | ||
| 308 | .procname = "sched_compat_yield", | ||
| 309 | .data = &sysctl_sched_compat_yield, | ||
| 310 | .maxlen = sizeof(unsigned int), | ||
| 311 | .mode = 0644, | ||
| 312 | .proc_handler = &proc_dointvec, | ||
| 313 | }, | ||
| 306 | #ifdef CONFIG_PROVE_LOCKING | 314 | #ifdef CONFIG_PROVE_LOCKING |
| 307 | { | 315 | { |
| 308 | .ctl_name = CTL_UNNUMBERED, | 316 | .ctl_name = CTL_UNNUMBERED, |