From 61770176997de2ac5fb5c04e79101ce8b4b0736a Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Wed, 5 Sep 2007 14:32:49 +0200 Subject: [PATCH] --- yaml --- r: 64727 b: refs/heads/master c: 4a55b45036a677fac43fe81ddf7fdcd007aaaee7 h: refs/heads/master i: 64725: 17c229f9d6da80e1c5e14c87e2b563ff460d6502 64723: 4cc67df68d73d9387834c3e28e8e37a4e705afe9 64719: 59a842b9cebf22899c54546b2a75ee6100f7b979 v: v3 --- [refs] | 2 +- trunk/kernel/sched_fair.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 71ade51cea3c..cc5c5f387872 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c92e54f6f9601cfa9d8894ee248abcf62ed9a1c +refs/heads/master: 4a55b45036a677fac43fe81ddf7fdcd007aaaee7 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index f0dd4be1a3a4..2d01bbc2d04a 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -684,10 +684,8 @@ __check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se, * preempt the current task unless the best task has * a larger than sched_granularity fairness advantage: */ - if (__delta > niced_granularity(curr, granularity)) { + if (__delta > niced_granularity(curr, granularity)) resched_task(rq_of(cfs_rq)->curr); - curr->prev_sum_exec_runtime = curr->sum_exec_runtime; - } } static inline void @@ -703,6 +701,7 @@ set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se) update_stats_wait_end(cfs_rq, se); update_stats_curr_start(cfs_rq, se); set_cfs_rq_curr(cfs_rq, se); + se->prev_sum_exec_runtime = se->sum_exec_runtime; } static struct sched_entity *pick_next_entity(struct cfs_rq *cfs_rq)