---

yaml --- r: 232501 b: refs/heads/master c: 05ca62c h: refs/heads/master i: 232499: 144fb32 v: v3
git-mirror · Jan 26, 2011 · c68ecd9 · c68ecd9
1 parent 4bb7a1a
commit c68ecd9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b815f1963e47b9b69bb17e0588bd5af5b1114ae0
+refs/heads/master: 05ca62c6ca17f39b88fa956d5ebc1fa6e93ad5e3
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -725,7 +725,7 @@ static void update_cfs_load(struct cfs_rq *cfs_rq, int global_update)
 	if (cfs_rq->tg == &root_task_group)
 		return;
 
-	now = rq_of(cfs_rq)->clock;
+	now = rq_of(cfs_rq)->clock_task;
 	delta = now - cfs_rq->load_stamp;
 
 	/* truncate load history at 4 idle periods */