Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4cfb33e authored by Wang Xingchao's avatar Wang Xingchao Committed by Ingo Molnar
Browse files

sched: Remove redundant test in check_preempt_tick() 



The caller already checks for nr_running > 1, therefore we don't have
to do so again.

Signed-off-by: default avatarWang Xingchao <xingchao.wang@intel.com>
Reviewed-by: default avatarPaul Turner <pjt@google.com>
Signed-off-by: default avatarPeter 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: default avatarIngo Molnar <mingo@elte.hu>
parent bfa322c4

kernel/sched_fair.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -1106,6 +1106,8 @@ static void 
check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)

check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)

{

{

	unsigned long ideal_runtime, delta_exec;

	unsigned long ideal_runtime, delta_exec;

	struct sched_entity *se;

	s64 delta;





	ideal_runtime = sched_slice(cfs_rq, curr);

	ideal_runtime = sched_slice(cfs_rq, curr);

	delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime;

	delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime;
@@ -1127,9 +1129,8 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr) 
	if (delta_exec < sysctl_sched_min_granularity)

	if (delta_exec < sysctl_sched_min_granularity)

		return;

		return;





	if (cfs_rq->nr_running > 1) {

	se = __pick_first_entity(cfs_rq);

		struct sched_entity *se = __pick_first_entity(cfs_rq);

	delta = curr->vruntime - se->vruntime;

		s64 delta = curr->vruntime - se->vruntime;





	if (delta < 0)

	if (delta < 0)

		return;

		return;
@@ -1137,7 +1138,6 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr) 
	if (delta > ideal_runtime)

	if (delta > ideal_runtime)

		resched_task(rq_of(cfs_rq)->curr);

		resched_task(rq_of(cfs_rq)->curr);

}

}

}





static void

static void

set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)

set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)