Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...

[~andy/linux] / kernel / sched_autogroup.c

diff --git a/kernel/sched_autogroup.c b/kernel/sched_autogroup.c
index c80fedcd476b9270c2fbbbc7c0d88fa5fa41d780..32a723b8f84cac397c51579a1f3099d35d1a25f0 100644 (file)
--- a/kernel/sched_autogroup.c
+++ b/kernel/sched_autogroup.c
@@ -9,10 +9,10 @@ unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
 static struct autogroup autogroup_default;
 static atomic_t autogroup_seq_nr;
 
-static void autogroup_init(struct task_struct *init_task)
+static void __init autogroup_init(struct task_struct *init_task)
 {
-       autogroup_default.tg = &init_task_group;
-       init_task_group.autogroup = &autogroup_default;
+       autogroup_default.tg = &root_task_group;
+       root_task_group.autogroup = &autogroup_default;
        kref_init(&autogroup_default.kref);
        init_rwsem(&autogroup_default.lock);
        init_task->signal->autogroup = &autogroup_default;
@@ -63,7 +63,7 @@ static inline struct autogroup *autogroup_create(void)
        if (!ag)
                goto out_fail;
 
-       tg = sched_create_group(&init_task_group);
+       tg = sched_create_group(&root_task_group);
 
        if (IS_ERR(tg))
                goto out_free;