---

yaml --- r: 69023 b: refs/heads/master c: 6cb5819 h: refs/heads/master i: 69021: 66bd8a7 69019: b69b9e4 69015: 54635eb 69007: 0a0ee01 68991: 1b003de v: v3
git-mirror · Oct 15, 2007 · 77ba2da · 77ba2da
1 parent b0beef1
commit 77ba2da
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf5c91ba8c629b84413c761f529627195fd0a935
+refs/heads/master: 6cb58195143b55d4c427d92f8425bec2b0d9c56c
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -732,13 +732,14 @@ calc_delta_fair(unsigned long delta_exec, struct load_weight *lw)
 static inline void update_load_add(struct load_weight *lw, unsigned long inc)
 {
 	lw->weight += inc;
-	lw->inv_weight = WMULT_CONST / lw->weight;
+	if (sched_feat(FAIR_SLEEPERS))
+		lw->inv_weight = WMULT_CONST / lw->weight;
 }
 
 static inline void update_load_sub(struct load_weight *lw, unsigned long dec)
 {
 	lw->weight -= dec;
-	if (likely(lw->weight))
+	if (sched_feat(FAIR_SLEEPERS) && likely(lw->weight))
 		lw->inv_weight = WMULT_CONST / lw->weight;
 }
 

diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -336,6 +336,9 @@ __update_curr(struct cfs_rq *cfs_rq, struct sched_entity *curr,
 	}
 	curr->vruntime += delta_exec_weighted;
 
+	if (!sched_feat(FAIR_SLEEPERS))
+		return;
+
 	if (unlikely(!load))
 		return;
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	curr->vruntime += delta_exec_weighted;
+    	if (!sched_feat(FAIR_SLEEPERS))
+    		return;
     	if (unlikely(!load))
     		return;
@@ Expand Down @@