From 83b103d507ca2bade06a63a9e52a3d703cf5a330 Mon Sep 17 00:00:00 2001
From: Paul Turner <pjt@google.com>
Date: Fri, 10 Jul 2009 17:05:16 -0700
Subject: [PATCH] --- yaml --- r: 155511 b: refs/heads/master c:
 d07387b490b1c43bfcb9f3900faf96f2dafb2630 h: refs/heads/master i:   155509:
 dfabcb319eccc33f064f3ab4953638fc71f5d4e4   155507:
 b825c65332b18be7961cf4cdf9b4fc9e55f974ef   155503:
 c3947f4a4be8c14191fe8d79e1ab30abcf23a8b7 v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/sched_fair.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7335a9cac922..7c88caaacfd9 100644
--- 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
index ba7fd6e9556f..7c248dc30f41 100644
--- 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;