[tip:sched/core] sched: Fix TASK_WAKING & loadaverage breakage
From: tip-bot for Ingo Molnar
Date: Thu Sep 17 2009 - 03:55:20 EST
Commit-ID: eb24073bc1fe3e569a855cf38d529fb650c35524
Gitweb: http://git.kernel.org/tip/eb24073bc1fe3e569a855cf38d529fb650c35524
Author: Ingo Molnar <mingo@xxxxxxx>
AuthorDate: Wed, 16 Sep 2009 21:09:13 +0200
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Thu, 17 Sep 2009 09:51:20 +0200
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@xxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
kernel/sched.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/kernel/sched.c b/kernel/sched.c
index 5049d95..969dfae 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/