diff --git a/[refs] b/[refs] index 379eb7617a45..421fe284d978 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c10c22af088ab5d94fae93ce3fe6436b2a208b4 +refs/heads/master: 34b3ede2353604ec9861c1d900b2a835ff85de47 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 2caedc47e764..9715f4ce6cfe 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -9088,7 +9088,6 @@ cpu_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cgrp) if (!cgrp->parent) { /* This is early initialization for the top cgroup */ - init_task_group.css.cgroup = cgrp; return &init_task_group.css; } @@ -9097,9 +9096,6 @@ cpu_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cgrp) if (IS_ERR(tg)) return ERR_PTR(-ENOMEM); - /* Bind the cgroup to task_group object we just created */ - tg->css.cgroup = cgrp; - return &tg->css; }