---

yaml --- r: 69108 b: refs/heads/master c: 810e95c h: refs/heads/master v: v3
git-mirror · Oct 15, 2007 · 48cf422 · 48cf422
1 parent 6c2573c
commit 48cf422
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a58f6f253d268f7b9712bd13c344a1fd89a3192f
+refs/heads/master: 810e95ccd58d91369191aa4ecc9e6d4a10d8d0c8
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -818,7 +818,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p)
 	struct task_struct *curr = rq->curr;
 	struct cfs_rq *cfs_rq = task_cfs_rq(curr);
 	struct sched_entity *se = &curr->se, *pse = &p->se;
-	s64 delta;
+	s64 delta, gran;
 
 	if (unlikely(rt_prio(p->prio))) {
 		update_rq_clock(rq);
@@ -833,8 +833,11 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p)
 	}
 
 	delta = se->vruntime - pse->vruntime;
+	gran = sysctl_sched_wakeup_granularity;
+	if (unlikely(se->load.weight != NICE_0_LOAD))
+		gran = calc_delta_fair(gran, &se->load);
 
-	if (delta > (s64)sysctl_sched_wakeup_granularity)
+	if (delta > gran)
 		resched_task(curr);
 }