From 2db64a0364323b617739b766f9044ce725297c28 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 4 Dec 2007 17:04:39 +0100
Subject: [PATCH] --- yaml --- r: 74555 b: refs/heads/master c:
 db292ca302e83534f5f0f7139e13d7e6976e51f9 h: refs/heads/master i:   74553:
 17a542abee0bc46fc885569e7e712954b30ba8dc   74551:
 b7266ac2aa9a8ba54daf44d7e42eba91244b933d v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/sched_fair.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e72a11b0f0fe..3d9621317fc7 100644
--- 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
index 37bb265598db..c33f0ceb3de9 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/kernel/sched_fair.c
@@ -799,8 +799,9 @@ 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?
@@ -808,7 +809,7 @@ static void yield_task_fair(struct rq *rq)
 	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'.