From: Ingo Molnar Date: Mon, 15 Oct 2007 15:00:05 +0000 (+0200) Subject: sched: simplify check_preempt() methods X-Git-Tag: v2.6.24-rc1~1289^2~118 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c6b5964a0629bd39fbf4e5648a8aca32de5bcaf;p=linux-2.6 sched: simplify check_preempt() methods simplify the check_preempt() methods. Signed-off-by: Ingo Molnar Signed-off-by: Peter Zijlstra Signed-off-by: Mike Galbraith --- diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 3179d1129a..45c7493d8c 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c @@ -582,8 +582,7 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int sleep) * Preempt the current task with a newly woken task if needed: */ static void -__check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se, - struct sched_entity *curr) +__check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *curr) { unsigned long ideal_runtime, delta_exec; @@ -663,7 +662,7 @@ static void entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr) if (next == curr) return; - __check_preempt_curr_fair(cfs_rq, next, curr); + __check_preempt_curr_fair(cfs_rq, curr); } /************************************************** @@ -866,7 +865,7 @@ static void check_preempt_curr_fair(struct rq *rq, struct task_struct *p) } if (is_same_group(curr, p)) - __check_preempt_curr_fair(cfs_rq, &p->se, &curr->se); + __check_preempt_curr_fair(cfs_rq, &curr->se); } static struct task_struct *pick_next_task_fair(struct rq *rq)