---

yaml --- r: 110703 b: refs/heads/master c: f31e11d h: refs/heads/master i: 110701: 2774a2c 110699: 3036e33 110695: f20d118 110687: 2376103 v: v3
git-mirror · Aug 22, 2008 · 54c4b1b · 54c4b1b
1 parent 9d59a86
commit 54c4b1b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94d3d8247de22c5b0624aa00616ceca459498e55
+refs/heads/master: f31e11d87a5d7601636710195891ba462ad99f11
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -1921,11 +1921,8 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
 		running = task_running(rq, p);
 		on_rq = p->se.on_rq;
 		ncsw = 0;
-		if (!match_state || p->state == match_state) {
-			ncsw = p->nivcsw + p->nvcsw;
-			if (unlikely(!ncsw))
-				ncsw = 1;
-		}
+		if (!match_state || p->state == match_state)
+			ncsw = p->nvcsw ?: 1;
 		task_rq_unlock(rq, &flags);
 
 		/*