sched: remove the 'u64 now' parameter from ->pick_next_task()
remove the 'u64 now' parameter from ->pick_next_task(). ( identity transformation that causes no change in functionality. ) Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
@@ -861,7 +861,7 @@ struct sched_class {
|
|||||||
|
|
||||||
void (*check_preempt_curr) (struct rq *rq, struct task_struct *p);
|
void (*check_preempt_curr) (struct rq *rq, struct task_struct *p);
|
||||||
|
|
||||||
struct task_struct * (*pick_next_task) (struct rq *rq, u64 now);
|
struct task_struct * (*pick_next_task) (struct rq *rq);
|
||||||
void (*put_prev_task) (struct rq *rq, struct task_struct *p, u64 now);
|
void (*put_prev_task) (struct rq *rq, struct task_struct *p, u64 now);
|
||||||
|
|
||||||
unsigned long (*load_balance) (struct rq *this_rq, int this_cpu,
|
unsigned long (*load_balance) (struct rq *this_rq, int this_cpu,
|
||||||
|
@@ -3410,14 +3410,14 @@ pick_next_task(struct rq *rq, struct task_struct *prev, u64 now)
|
|||||||
* the fair class we can call that function directly:
|
* the fair class we can call that function directly:
|
||||||
*/
|
*/
|
||||||
if (likely(rq->nr_running == rq->cfs.nr_running)) {
|
if (likely(rq->nr_running == rq->cfs.nr_running)) {
|
||||||
p = fair_sched_class.pick_next_task(rq, now);
|
p = fair_sched_class.pick_next_task(rq);
|
||||||
if (likely(p))
|
if (likely(p))
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
class = sched_class_highest;
|
class = sched_class_highest;
|
||||||
for ( ; ; ) {
|
for ( ; ; ) {
|
||||||
p = class->pick_next_task(rq, now);
|
p = class->pick_next_task(rq);
|
||||||
if (p)
|
if (p)
|
||||||
return p;
|
return p;
|
||||||
/*
|
/*
|
||||||
|
@@ -859,7 +859,7 @@ static void check_preempt_curr_fair(struct rq *rq, struct task_struct *p)
|
|||||||
__check_preempt_curr_fair(cfs_rq, &p->se, &curr->se, gran);
|
__check_preempt_curr_fair(cfs_rq, &p->se, &curr->se, gran);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct task_struct *pick_next_task_fair(struct rq *rq, u64 now)
|
static struct task_struct *pick_next_task_fair(struct rq *rq)
|
||||||
{
|
{
|
||||||
struct cfs_rq *cfs_rq = &rq->cfs;
|
struct cfs_rq *cfs_rq = &rq->cfs;
|
||||||
struct sched_entity *se;
|
struct sched_entity *se;
|
||||||
|
@@ -13,7 +13,7 @@ static void check_preempt_curr_idle(struct rq *rq, struct task_struct *p)
|
|||||||
resched_task(rq->idle);
|
resched_task(rq->idle);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct task_struct *pick_next_task_idle(struct rq *rq, u64 now)
|
static struct task_struct *pick_next_task_idle(struct rq *rq)
|
||||||
{
|
{
|
||||||
schedstat_inc(rq, sched_goidle);
|
schedstat_inc(rq, sched_goidle);
|
||||||
|
|
||||||
|
@@ -73,7 +73,7 @@ static void check_preempt_curr_rt(struct rq *rq, struct task_struct *p)
|
|||||||
resched_task(rq->curr);
|
resched_task(rq->curr);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct task_struct *pick_next_task_rt(struct rq *rq, u64 now)
|
static struct task_struct *pick_next_task_rt(struct rq *rq)
|
||||||
{
|
{
|
||||||
struct rt_prio_array *array = &rq->rt.active;
|
struct rt_prio_array *array = &rq->rt.active;
|
||||||
struct task_struct *next;
|
struct task_struct *next;
|
||||||
|
Reference in New Issue
Block a user