summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-29 08:05:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-29 08:05:33 -0700
commit37542b6a7e73e81f8c066a48e6911e476ee3b22f (patch)
tree39da99d28803b18c223eebe45c3170992ee08b7e /include
parentc07724e5b868c603f2a65f3855c77b23454db3ed (diff)
parentd4a6f3c32c39132318454e77d59ab14b06f6eb02 (diff)
downloadlinux-37542b6a7e73e81f8c066a48e6911e476ee3b22f.tar.bz2
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')
-rw-r--r--include/linux/sched.h2
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 {
struct task_struct *task);
#ifdef CONFIG_FAIR_GROUP_SCHED
- void (*moved_group) (struct task_struct *p, int on_rq);
+ void (*task_move_group) (struct task_struct *p, int on_rq);
#endif
};