---

yaml --- r: 74555 b: refs/heads/master c: db292ca h: refs/heads/master i: 74553: 17a542a 74551: b7266ac v: v3
git-mirror · Dec 4, 2007 · 2db64a0 · 2db64a0
1 parent cab1ad8
commit 2db64a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77034937dc4575ca0a76bf209838ecd39e804089
+refs/heads/master: db292ca302e83534f5f0f7139e13d7e6976e51f9
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -799,16 +799,17 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int sleep)
  */
 static void yield_task_fair(struct rq *rq)
 {
-	struct cfs_rq *cfs_rq = task_cfs_rq(rq->curr);
-	struct sched_entity *rightmost, *se = &rq->curr->se;
+	struct task_struct *curr = rq->curr;
+	struct cfs_rq *cfs_rq = task_cfs_rq(curr);
+	struct sched_entity *rightmost, *se = &curr->se;
 
 	/*
 	 * Are we the only task in the tree?
 	 */
 	if (unlikely(cfs_rq->nr_running == 1))
 		return;
 
-	if (likely(!sysctl_sched_compat_yield)) {
+	if (likely(!sysctl_sched_compat_yield) && curr->policy != SCHED_BATCH) {
 		__update_rq_clock(rq);
 		/*
 		 * Update run-time statistics of the 'current'.