diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 22:58:49 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 22:58:49 -0500 |
commit | 0a6d4e1dc9154c4376358663d74060d1e33d203e (patch) | |
tree | 5e0b72984d249bc215a6cd52b12e7b1d27abc852 /include/linux/sched.h | |
parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
parent | 1563513d34ed4b12ef32bc2adde4a53ce05701a1 (diff) |
Merge branch 'sched/latest' of git://git.kernel.org/pub/scm/linux/kernel/git/ghaskins/linux-2.6-hacks into sched/rt
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 4cae9b81a1f8..c37c5141037b 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -977,6 +977,7 @@ struct sched_class { | |||
977 | struct rq *busiest, struct sched_domain *sd, | 977 | struct rq *busiest, struct sched_domain *sd, |
978 | enum cpu_idle_type idle); | 978 | enum cpu_idle_type idle); |
979 | void (*pre_schedule) (struct rq *this_rq, struct task_struct *task); | 979 | void (*pre_schedule) (struct rq *this_rq, struct task_struct *task); |
980 | int (*needs_post_schedule) (struct rq *this_rq); | ||
980 | void (*post_schedule) (struct rq *this_rq); | 981 | void (*post_schedule) (struct rq *this_rq); |
981 | void (*task_wake_up) (struct rq *this_rq, struct task_struct *task); | 982 | void (*task_wake_up) (struct rq *this_rq, struct task_struct *task); |
982 | 983 | ||
@@ -1143,6 +1144,7 @@ struct task_struct { | |||
1143 | #endif | 1144 | #endif |
1144 | 1145 | ||
1145 | struct list_head tasks; | 1146 | struct list_head tasks; |
1147 | struct plist_node pushable_tasks; | ||
1146 | 1148 | ||
1147 | struct mm_struct *mm, *active_mm; | 1149 | struct mm_struct *mm, *active_mm; |
1148 | 1150 | ||