---

yaml --- r: 121345 b: refs/heads/master c: 34f28ec h: refs/heads/master i: 121343: 57a60d0 v: v3
git-mirror · Dec 16, 2008 · 475c3ba · 475c3ba
1 parent 6ca34c2
commit 475c3ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03e89e4574a680af15f59329b061f35d9813aff4
+refs/heads/master: 34f28ecd0f4bdc733c681294d02d9fab5880591b
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -492,6 +492,8 @@ static void update_curr(struct cfs_rq *cfs_rq)
 	 * overflow on 32 bits):
 	 */
 	delta_exec = (unsigned long)(now - curr->exec_start);
+	if (!delta_exec)
+		return;
 
 	__update_curr(cfs_rq, curr, delta_exec);
 	curr->exec_start = now;