Skip to content

Commit

Permalink
sched: Remove redundant test in check_preempt_tick()
Browse files Browse the repository at this point in the history
The caller already checks for nr_running > 1, therefore we don't have
to do so again.

Signed-off-by: Wang Xingchao <xingchao.wang@intel.com>
Reviewed-by: Paul Turner <pjt@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1316194552-12019-1-git-send-email-xingchao.wang@intel.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Wang Xingchao authored and Ingo Molnar committed Sep 26, 2011
1 parent bfa322c commit f4cfb33
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions kernel/sched_fair.c
Original file line number Diff line number Diff line change
Expand Up @@ -1106,6 +1106,8 @@ static void
check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
{
unsigned long ideal_runtime, delta_exec;
struct sched_entity *se;
s64 delta;

ideal_runtime = sched_slice(cfs_rq, curr);
delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime;
Expand All @@ -1127,16 +1129,14 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
if (delta_exec < sysctl_sched_min_granularity)
return;

if (cfs_rq->nr_running > 1) {
struct sched_entity *se = __pick_first_entity(cfs_rq);
s64 delta = curr->vruntime - se->vruntime;
se = __pick_first_entity(cfs_rq);
delta = curr->vruntime - se->vruntime;

if (delta < 0)
return;
if (delta < 0)
return;

if (delta > ideal_runtime)
resched_task(rq_of(cfs_rq)->curr);
}
if (delta > ideal_runtime)
resched_task(rq_of(cfs_rq)->curr);
}

static void
Expand Down

0 comments on commit f4cfb33

Please sign in to comment.