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;