diff --git a/[refs] b/[refs] index 489d0d571b22..f86ac22c3aaf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d0f0ebd063e36cd0ebae9be15973b02c4245a99 +refs/heads/master: 5c6b5964a0629bd39fbf4e5648a8aca32de5bcaf diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 3179d1129a80..45c7493d8ca8 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/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)