---

yaml --- r: 323929 b: refs/heads/master c: 38b8dd6 h: refs/heads/master i: 323927: 97810dc v: v3
git-mirror · Sep 4, 2012 · 6a55965 · 6a55965
1 parent cac31d3
commit 6a55965
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d00535db42805e9ae5eadf1b4a86e01e85674b0c
+refs/heads/master: 38b8dd6f87398524d02c21ff614c507ba8c9d295
diff --git a/trunk/kernel/sched/core.c b/trunk/kernel/sched/core.c
@@ -4348,13 +4348,6 @@ bool __sched yield_to(struct task_struct *p, bool preempt)
 		 */
 		if (preempt && rq != p_rq)
 			resched_task(p_rq->curr);
-	} else {
-		/*
-		 * We might have set it in task_yield_fair(), but are
-		 * not going to schedule(), so don't want to skip
-		 * the next update.
-		 */
-		rq->skip_clock_update = 0;
 	}
 
 out: