---

yaml --- r: 73406 b: refs/heads/master c: 502d26b h: refs/heads/master v: v3
git-mirror · Nov 9, 2007 · c4547c1 · c4547c1
1 parent f29c9e1
commit c4547c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77d9cc44b543fa831169e54c495ad06ef3a0c726
+refs/heads/master: 502d26b524d8980f3ed80d9aec398e85671a8160
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -837,7 +837,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, gran;
+	unsigned long gran;
 
 	if (unlikely(rt_prio(p->prio))) {
 		update_rq_clock(rq);
@@ -860,12 +860,11 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p)
 		pse = parent_entity(pse);
 	}
 
-	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 > gran)
+	if (pse->vruntime + gran < se->vruntime)
 		resched_task(curr);
 }