diff options
author | Mark Brown <broonie@linaro.org> | 2013-11-13 12:06:30 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-13 12:06:30 +0000 |
commit | 54a3a4d441e9eaceb86989f0b466e77815ab6129 (patch) | |
tree | eab08ab86a34f0a071467435b42f733d1af013cf /kernel/cgroup.c | |
parent | 7c9373fbcd0b29f6ccc28407c11ecd51cfa7a3c2 (diff) | |
parent | 3729ed7c6aa8c5b9eee8f832e4a246b8fa1d56b5 (diff) |
Merge tag 'v3.10.19' into linux-linaro-lsk
This is the 3.10.19 stable release
Diffstat (limited to 'kernel/cgroup.c')
-rw-r--r-- | kernel/cgroup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 2e9b387971d..b6b26faf174 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -1995,7 +1995,7 @@ static int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk, /* @tsk either already exited or can't exit until the end */ if (tsk->flags & PF_EXITING) - continue; + goto next; /* as per above, nr_threads may decrease, but not increase. */ BUG_ON(i >= group_size); @@ -2003,7 +2003,7 @@ static int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk, ent.cgrp = task_cgroup_from_root(tsk, root); /* nothing to do if this task is already in the cgroup */ if (ent.cgrp == cgrp) - continue; + goto next; /* * saying GFP_ATOMIC has no effect here because we did prealloc * earlier, but it's good form to communicate our expectations. @@ -2011,7 +2011,7 @@ static int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk, retval = flex_array_put(group, i, &ent, GFP_ATOMIC); BUG_ON(retval != 0); i++; - + next: if (!threadgroup) break; } while_each_thread(leader, tsk); |