---

yaml --- r: 163023 b: refs/heads/master c: eb24073 h: refs/heads/master i: 163021: ebcedaf 163019: 9e235b9 163015: 10db5ab 163007: 21b9d1b v: v3
git-mirror · Sep 17, 2009 · 4c2008e · 4c2008e
1 parent f8062ad
commit 4c2008e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 182a85f8a119c789610a9d464f4129ded9f3c107
+refs/heads/master: eb24073bc1fe3e569a855cf38d529fb650c35524
diff --git a/trunk/kernel/sched.c b/trunk/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);