diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-25 20:25:29 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-25 20:25:29 +0200 |
commit | a3ce8ea66ae9379235334a989ed78a1ea518b0b3 (patch) | |
tree | 88bef2140c00ec607f2d222e953ed380999eb4a6 /include | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee... (diff) | |
parent | sched: cleanup, sched_granularity -> sched_min_granularity (diff) | |
download | linux-a3ce8ea66ae9379235334a989ed78a1ea518b0b3.tar.xz linux-a3ce8ea66ae9379235334a989ed78a1ea518b0b3.zip |
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: cleanup, sched_granularity -> sched_min_granularity
sched: adaptive scheduler granularity
sched: fix CONFIG_SCHED_DEBUG dependency of lockdep sysctls
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/sched.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index ba78807eab91..bd6a0320a770 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1399,7 +1399,8 @@ static inline void idle_task_exit(void) {} extern void sched_idle_next(void); -extern unsigned int sysctl_sched_granularity; +extern unsigned int sysctl_sched_latency; +extern unsigned int sysctl_sched_min_granularity; extern unsigned int sysctl_sched_wakeup_granularity; extern unsigned int sysctl_sched_batch_wakeup_granularity; extern unsigned int sysctl_sched_stat_granularity; |