summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-07 14:55:48 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-07 14:55:48 -0800
commite744070fd4ff9d3114277e52d77afa21579adce2 (patch)
tree5f397c684c61a50bd47014abfe685fd6c3d09d8c /include
parentd004e4d3322340b6433caaef4a47ab8c933afb70 (diff)
parentc9b5f501ef1580faa30c40c644b7691870462201 (diff)
downloadlinux-3.10-e744070fd4ff9d3114277e52d77afa21579adce2.tar.gz
linux-3.10-e744070fd4ff9d3114277e52d77afa21579adce2.tar.bz2
linux-3.10-e744070fd4ff9d3114277e52d77afa21579adce2.zip
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: Constify function scope static struct sched_param usage sched: Fix strncmp operation sched: Move sched_autogroup_exit() to free_signal_struct() sched: Fix struct autogroup memory leak sched: Mark autogroup_init() __init sched: Consolidate the name of root_task_group and init_task_group
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 777cd01e240..341acbbc434 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2511,7 +2511,7 @@ extern void normalize_rt_tasks(void);
#ifdef CONFIG_CGROUP_SCHED
-extern struct task_group init_task_group;
+extern struct task_group root_task_group;
extern struct task_group *sched_create_group(struct task_group *parent);
extern void sched_destroy_group(struct task_group *tg);