summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-20 11:44:18 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-20 11:44:18 -0800
commita4a4923919f2d43583789b1f3603f4e5600d8321 (patch)
treeb401e5b82050d33fc345d815d8b28ff83301534c /kernel
parent7f3a54b8177f2e663adef2ec4b5e6ccf874f896e (diff)
parente0197aae59e55c06db172bfbe1a1cdb8c0e1cab3 (diff)
Merge branch 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
* 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cgroups: fix a css_set not found bug in cgroup_attach_proc
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index d9d5648f3cdc..a184470cf9b5 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -2098,11 +2098,6 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
continue;
/* get old css_set pointer */
task_lock(tsk);
- if (tsk->flags & PF_EXITING) {
- /* ignore this task if it's going away */
- task_unlock(tsk);
- continue;
- }
oldcg = tsk->cgroups;
get_css_set(oldcg);
task_unlock(tsk);