Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11dc8b40 authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'for-5.2-fixes' into for-5.3

parents a5e112e6 c596687a

kernel/cgroup/cgroup.c

+5 −1
Original line number Diff line number Diff line
@@ -4401,7 +4401,7 @@ static void css_task_iter_advance_css_set(struct css_task_iter *it) 
			it->task_pos = NULL;

			return;

		}

	} while (!css_set_populated(cset) && !list_empty(&cset->dying_tasks));

	} while (!css_set_populated(cset) && list_empty(&cset->dying_tasks));



	if (!list_empty(&cset->tasks))

		it->task_pos = cset->tasks.next;
@@ -4550,6 +4550,10 @@ struct task_struct *css_task_iter_next(struct css_task_iter *it) 


	spin_lock_irq(&css_set_lock);



	/* @it may be half-advanced by skips, finish advancing */

	if (it->flags & CSS_TASK_ITER_SKIPPED)

		css_task_iter_advance(it);



	if (it->task_pos) {

		it->cur_task = list_entry(it->task_pos, struct task_struct,

					  cg_list);