From 6a5596595444899961eb42a7c4225440718e225c Mon Sep 17 00:00:00 2001
From: Michael Wang <wangyun@linux.vnet.ibm.com>
Date: Tue, 3 Jul 2012 14:34:02 +0800
Subject: [PATCH] --- yaml --- r: 323929 b: refs/heads/master c:
 38b8dd6f87398524d02c21ff614c507ba8c9d295 h: refs/heads/master i:   323927:
 97810dca6461fb74b9691f84506a1d9dd7b01da1 v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/sched/core.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 961acb3fc397..bd1c9035e919 100644
--- 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
index ec0f2b81b81c..c46a011ce5db 100644
--- 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: