Commit eb24073b authored Sep 16, 2009 by Ingo Molnar

sched: Fix TASK_WAKING & loadaverage breakage



Fix this:

top - 21:54:00 up  2:59,  1 user,  load average: 432512.33, 426421.74, 417432.74

Which happens because we now set TASK_WAKING before activate_task().

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 182a85f8

kernel/sched.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -2343,7 +2343,11 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state,
		/*
		* In order to handle concurrent wakeups and release the rq->lock
		* we put the task in TASK_WAKING state.
		*
		* First fix up the nr_uninterruptible count:
		*/
		if (task_contributes_to_load(p))
		rq->nr_uninterruptible--;
		p->state = TASK_WAKING;
		task_rq_unlock(rq, &flags);