---

yaml --- r: 234539 b: refs/heads/master c: f07333b h: refs/heads/master i: 234537: 21c67be 234535: b0bba51 v: v3
git-mirror · Jan 26, 2011 · 4977184 · 4977184
1 parent 95df197
commit 4977184
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d5ab2932a21ea54406ab95c43ecff90a3eddfda
+refs/heads/master: f07333bf6ee66d9b49286cec4371cf375e745b7a
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -7796,6 +7796,8 @@ static void init_cfs_rq(struct cfs_rq *cfs_rq, struct rq *rq)
 	INIT_LIST_HEAD(&cfs_rq->tasks);
 #ifdef CONFIG_FAIR_GROUP_SCHED
 	cfs_rq->rq = rq;
+	/* allow initial update_cfs_load() to truncate */
+	cfs_rq->load_stamp = 1;
 #endif
 	cfs_rq->min_vruntime = (u64)(-(1LL << 20));
 }

diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -733,6 +733,7 @@ static void update_cfs_load(struct cfs_rq *cfs_rq, int global_update)
 	    now - cfs_rq->load_last > 4 * period) {
 		cfs_rq->load_period = 0;
 		cfs_rq->load_avg = 0;
+		delta = period - 1;
 	}
 
 	cfs_rq->load_stamp = now;