---

yaml --- r: 155511 b: refs/heads/master c: d07387b h: refs/heads/master i: 155509: dfabcb3 155507: b825c65 155503: c3947f4 v: v3
git-mirror · Jul 11, 2009 · 83b103d · 83b103d
1 parent cf90e79
commit 83b103d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c20b08e3986c2dbfa6df1e880bf4f7159994d199
+refs/heads/master: d07387b490b1c43bfcb9f3900faf96f2dafb2630
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -687,7 +687,8 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
 			 * all of which have the same weight.
 			 */
 			if (sched_feat(NORMALIZED_SLEEPER) &&
-					task_of(se)->policy != SCHED_IDLE)
+					(!entity_is_task(se) ||
+					 task_of(se)->policy != SCHED_IDLE))
 				thresh = calc_delta_fair(thresh, se);
 
 			vruntime -= thresh;