commit b9d6ae7f58d056112b1bbc08a3eae3993d283d1e
author Linux Build Service Account <lnxbuild@localhost> Tue May 14 21:43:21 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue May 14 21:43:20 2013 -0700
tree 2e34345df114e050e598afbffe0c7666dae30bbf
parent 6d07d028a5de55a53bd70371f949a2fc8f001017
parent 63a5fe4edc7cbcb0f8379dd635241c070023f2df

Merge "sched: fix reference to wrong cfs_rq"

kernel/sched/fair.c

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 7e31770..a1bd252 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -2126,11 +2126,11 @@
 static void hrtick_start_fair(struct rq *rq, struct task_struct *p)
 {
 	struct sched_entity *se = &p->se;
-	struct cfs_rq *cfs_rq = &rq->cfs;
+	struct cfs_rq *cfs_rq = cfs_rq_of(se);
 
 	WARN_ON(task_rq(p) != rq);
 
-	if (cfs_rq->h_nr_running > 1) {
+	if (rq->cfs.h_nr_running > 1) {
 		u64 slice = sched_slice(cfs_rq, se);
 		u64 ran = se->sum_exec_runtime - se->prev_sum_exec_runtime;
 		s64 delta = slice - ran;