---

yaml --- r: 69103 b: refs/heads/master c: 06877c3 h: refs/heads/master i: 69101: 69238bd 69099: 6d31c37 69095: 862ce67 69087: 79260a9 v: v3
git-mirror · Oct 15, 2007 · 01e4181 · 01e4181
1 parent d7a0ac2
commit 01e4181
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a65914b3658043da27c159b8a28c5811bb0a88c9
+refs/heads/master: 06877c33fe9261ccdf143492c28de93c56493079
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -440,14 +440,14 @@ static void update_rq_clock(struct rq *rq)
 enum {
 	SCHED_FEAT_NEW_FAIR_SLEEPERS	= 1,
 	SCHED_FEAT_START_DEBIT		= 2,
-	SCHED_FEAT_USE_TREE_AVG         = 4,
+	SCHED_FEAT_TREE_AVG             = 4,
 	SCHED_FEAT_APPROX_AVG           = 8,
 };
 
 const_debug unsigned int sysctl_sched_features =
 		SCHED_FEAT_NEW_FAIR_SLEEPERS	*1 |
 		SCHED_FEAT_START_DEBIT		*1 |
-		SCHED_FEAT_USE_TREE_AVG		*0 |
+		SCHED_FEAT_TREE_AVG		*0 |
 		SCHED_FEAT_APPROX_AVG		*0;
 
 #define sched_feat(x) (sysctl_sched_features & SCHED_FEAT_##x)

diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -477,7 +477,7 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
 
 	vruntime = cfs_rq->min_vruntime;
 
-	if (sched_feat(USE_TREE_AVG)) {
+	if (sched_feat(TREE_AVG)) {
 		struct sched_entity *last = __pick_last_entity(cfs_rq);
 		if (last) {
 			vruntime += last->vruntime;