Commit 498bdcdb authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'sched/urgent' into sched/core, to pick up fix 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 2ebb1771 18f855e5

kernel/sched/fair.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2908,7 +2908,7 @@ static void task_tick_numa(struct rq *rq, struct task_struct *curr) 
	/*

	/*

	 * We don't care about NUMA placement if we don't have memory.

	 * We don't care about NUMA placement if we don't have memory.

	 */

	 */

	if (!curr->mm || (curr->flags & PF_EXITING) || work->next != work)

	if ((curr->flags & (PF_EXITING | PF_KTHREAD)) || work->next != work)

		return;

		return;





	/*

	/*