diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 11:05:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 11:05:33 -0400 |
commit | 37542b6a7e73e81f8c066a48e6911e476ee3b22f (patch) | |
tree | 39da99d28803b18c223eebe45c3170992ee08b7e /include/linux/sched.h | |
parent | c07724e5b868c603f2a65f3855c77b23454db3ed (diff) | |
parent | d4a6f3c32c39132318454e77d59ab14b06f6eb02 (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_stat: Update sched_info_queue/dequeue() code comments
sched, cgroup: Fixup broken cgroup movement
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index be7adb7588e5..f53cdf216cef 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -1080,7 +1080,7 @@ struct sched_class { | |||
1080 | struct task_struct *task); | 1080 | struct task_struct *task); |
1081 | 1081 | ||
1082 | #ifdef CONFIG_FAIR_GROUP_SCHED | 1082 | #ifdef CONFIG_FAIR_GROUP_SCHED |
1083 | void (*moved_group) (struct task_struct *p, int on_rq); | 1083 | void (*task_move_group) (struct task_struct *p, int on_rq); |
1084 | #endif | 1084 | #endif |
1085 | }; | 1085 | }; |
1086 | 1086 | ||