diff --git a/[refs] b/[refs] index cb95b9784b46..131f1501816d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29f59db3a74b0bdf78a1f5b53ef773caa82692dc +refs/heads/master: d02e5ed8d55e2a2b2735232ea1da40ffbf4c0932 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 12ab9338d563..144f3ef97380 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -984,6 +984,10 @@ static void set_curr_task_fair(struct rq *rq) #else static void set_curr_task_fair(struct rq *rq) { + struct sched_entity *se = &rq->curr->se; + struct cfs_rq *cfs_rq = cfs_rq_of(se); + + cfs_rq->curr = se; } #endif