summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-10-15 10:19:18 +0100
committerMark Brown <broonie@kernel.org>2018-10-15 10:19:18 +0100
commitebbfef1f746893c84d2d5991ee816ac181d211c8 (patch)
tree7fbee8e9adae6f61adbb15419669346f4c1f5834 /kernel
parentcf210428987682af02e47df255012a21fb779657 (diff)
parentb001adea66f0e0a7803adfbf9128a2d7969daa4e (diff)
Merge tag 'v4.4.161' into linux-linaro-lsk-v4.4
This is the 4.4.161 stable release
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index ca961af986f7..06287bac5358 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -4081,7 +4081,11 @@ int cgroup_transfer_tasks(struct cgroup *to, struct cgroup *from)
*/
do {
css_task_iter_start(&from->self, &it);
- task = css_task_iter_next(&it);
+
+ do {
+ task = css_task_iter_next(&it);
+ } while (task && (task->flags & PF_EXITING));
+
if (task)
get_task_struct(task);
css_task_iter_end(&it);