diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 12:06:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 12:06:17 -0400 |
commit | 8e4bc3dd2ca07d77882eba73cea240aba95a1854 (patch) | |
tree | da105cd2c4f51c78c401c00d8b399572914694ed /include | |
parent | bd4c3a3441144cd46d1f544046523724c5bc6e94 (diff) | |
parent | 0d721ceadbeaa24d7f9dd41b3e5e29912327a7e1 (diff) |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Simplify sys_sched_rr_get_interval() system call
sched: Fix potential NULL derference of doms_cur
sched: Fix raciness in runqueue_is_locked()
sched: Re-add lost cpu_allowed check to sched_fair.c::select_task_rq_fair()
sched: Remove unneeded indentation in sched_fair.c::place_entity()
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/sched.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 8af3d249170e..239c8e0dba9f 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -257,7 +257,7 @@ extern asmlinkage void schedule_tail(struct task_struct *prev); | |||
257 | extern void init_idle(struct task_struct *idle, int cpu); | 257 | extern void init_idle(struct task_struct *idle, int cpu); |
258 | extern void init_idle_bootup_task(struct task_struct *idle); | 258 | extern void init_idle_bootup_task(struct task_struct *idle); |
259 | 259 | ||
260 | extern int runqueue_is_locked(void); | 260 | extern int runqueue_is_locked(int cpu); |
261 | extern void task_rq_unlock_wait(struct task_struct *p); | 261 | extern void task_rq_unlock_wait(struct task_struct *p); |
262 | 262 | ||
263 | extern cpumask_var_t nohz_cpu_mask; | 263 | extern cpumask_var_t nohz_cpu_mask; |
@@ -1075,6 +1075,8 @@ struct sched_class { | |||
1075 | void (*prio_changed) (struct rq *this_rq, struct task_struct *task, | 1075 | void (*prio_changed) (struct rq *this_rq, struct task_struct *task, |
1076 | int oldprio, int running); | 1076 | int oldprio, int running); |
1077 | 1077 | ||
1078 | unsigned int (*get_rr_interval) (struct task_struct *task); | ||
1079 | |||
1078 | #ifdef CONFIG_FAIR_GROUP_SCHED | 1080 | #ifdef CONFIG_FAIR_GROUP_SCHED |
1079 | void (*moved_group) (struct task_struct *p); | 1081 | void (*moved_group) (struct task_struct *p); |
1080 | #endif | 1082 | #endif |