From 84772f8a68a90846d7d56df7d17705a7d6efd929 Mon Sep 17 00:00:00 2001
From: Srivatsa Vaddagiri <vatsa@linux.vnet.ibm.com>
Date: Mon, 15 Oct 2007 17:00:08 +0200
Subject: [PATCH] --- yaml --- r: 69055 b: refs/heads/master c:
 72ea22f8fbc893425faefa60641f45a4cdef2261 h: refs/heads/master i:   69053:
 172bd5e62f7ca43f8a70dc63cfe4c5c848d2ad90   69051:
 a3034e0d54d24a3b52880fda9b9425a08f171a7c   69047:
 85264aac0678e170b739de2959c1a30ab4fb3d28   69039:
 bfae9e99fdfe95b8d142db526abd1fa5db3f4107   69023:
 77ba2da15213c208f4c8f42276eb1a4e64d312cf   68991:
 1b003de91c3b59231f3a1f939807c14085198244 v: v3

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

diff --git a/[refs] b/[refs]
index 24915838d88c..cbdc6f930043 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83b699ed20f5218580a1b7042064082e2e05f8c5
+refs/heads/master: 72ea22f8fbc893425faefa60641f45a4cdef2261
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index 92563cd5af75..d8d2e2ff513d 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/kernel/sched_fair.c
@@ -725,7 +725,7 @@ 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 = &rq->cfs;
+	struct cfs_rq *cfs_rq = task_cfs_rq(rq->curr);
 	struct rb_node **link = &cfs_rq->tasks_timeline.rb_node;
 	struct sched_entity *rightmost, *se = &rq->curr->se;
 	struct rb_node *parent;