diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 14:55:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 14:55:48 -0800 |
| commit | e744070fd4ff9d3114277e52d77afa21579adce2 (patch) | |
| tree | 5f397c684c61a50bd47014abfe685fd6c3d09d8c /include | |
| parent | Merge branch 'x86-apic-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | sched: Constify function scope static struct sched_param usage (diff) | |
| download | linux-dev-e744070fd4ff9d3114277e52d77afa21579adce2.tar.xz linux-dev-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.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 777cd01e240e..341acbbc434a 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); |