---

yaml --- r: 191407 b: refs/heads/master c: cc87f76 h: refs/heads/master i: 191405: 6f63501 191403: 1862f62 191399: ccaae26 191391: be89796 v: v3
git-mirror · Apr 2, 2010 · 567cf02 · 567cf02
1 parent 6898e26
commit 567cf02
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65cc8e4859ff29a9ddc989c88557d6059834c2a2
+refs/heads/master: cc87f76a601d2d256118f7bab15e35254356ae21
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -2378,8 +2378,12 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state,
 	 *
 	 * First fix up the nr_uninterruptible count:
 	 */
-	if (task_contributes_to_load(p))
-		rq->nr_uninterruptible--;
+	if (task_contributes_to_load(p)) {
+		if (likely(cpu_online(orig_cpu)))
+			rq->nr_uninterruptible--;
+		else
+			this_rq()->nr_uninterruptible--;
+	}
 	p->state = TASK_WAKING;
 
 	if (p->sched_class->task_waking)