---

yaml
---
r: 277383
b: refs/heads/master
c: 916671c
h: refs/heads/master
i:
  277381: f30bdbd
  277379: 840f86e
  277375: b37a1d9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76854c7e8f3f4172fef091e78d88b3b751463ac6
+refs/heads/master: 916671c08b7808aebec87cc56c85788e665b3c6b

trunk/kernel/sched/core.c

@@ -4547,6 +4547,13 @@ 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:

trunk/kernel/sched/fair.c

@@ -3075,6 +3075,12 @@ static void yield_task_fair(struct rq *rq)
 		 * Update run-time statistics of the 'current'.
 		 */
 		update_curr(cfs_rq);
+		/*
+		 * Tell update_rq_clock() that we've just updated,
+		 * so we don't do microscopic update in schedule()
+		 * and double the fastpath cost.
+		 */
+		 rq->skip_clock_update = 1;
 	}
 
 	set_skip_buddy(se);