diff options
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index e142e92f38da..79e611cd83dd 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -606,9 +606,6 @@ static inline struct task_group *task_group(struct task_struct *p) | |||
| 606 | struct task_group *tg; | 606 | struct task_group *tg; |
| 607 | struct cgroup_subsys_state *css; | 607 | struct cgroup_subsys_state *css; |
| 608 | 608 | ||
| 609 | if (p->flags & PF_EXITING) | ||
| 610 | return &root_task_group; | ||
| 611 | |||
| 612 | css = task_subsys_state_check(p, cpu_cgroup_subsys_id, | 609 | css = task_subsys_state_check(p, cpu_cgroup_subsys_id, |
| 613 | lockdep_is_held(&task_rq(p)->lock)); | 610 | lockdep_is_held(&task_rq(p)->lock)); |
| 614 | tg = container_of(css, struct task_group, css); | 611 | tg = container_of(css, struct task_group, css); |
| @@ -8863,7 +8860,8 @@ cpu_cgroup_attach(struct cgroup_subsys *ss, struct cgroup *cgrp, | |||
| 8863 | } | 8860 | } |
| 8864 | 8861 | ||
| 8865 | static void | 8862 | static void |
| 8866 | cpu_cgroup_exit(struct cgroup_subsys *ss, struct task_struct *task) | 8863 | cpu_cgroup_exit(struct cgroup_subsys *ss, struct cgroup *cgrp, |
| 8864 | struct cgroup *old_cgrp, struct task_struct *task) | ||
| 8867 | { | 8865 | { |
| 8868 | /* | 8866 | /* |
| 8869 | * cgroup_exit() is called in the copy_process() failure path. | 8867 | * cgroup_exit() is called in the copy_process() failure path. |