diff options
-rw-r--r-- | include/linux/sched.h | 2 | ||||
-rw-r--r-- | kernel/sched.c | 4 | ||||
-rw-r--r-- | kernel/sched_fair.c | 2 | ||||
-rw-r--r-- | kernel/sched_idletask.c | 2 | ||||
-rw-r--r-- | kernel/sched_rt.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index c7815a6b70e0..c6ad4071c791 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -861,7 +861,7 @@ struct sched_class { | |||
861 | 861 | ||
862 | void (*check_preempt_curr) (struct rq *rq, struct task_struct *p); | 862 | void (*check_preempt_curr) (struct rq *rq, struct task_struct *p); |
863 | 863 | ||
864 | struct task_struct * (*pick_next_task) (struct rq *rq, u64 now); | 864 | struct task_struct * (*pick_next_task) (struct rq *rq); |
865 | void (*put_prev_task) (struct rq *rq, struct task_struct *p, u64 now); | 865 | void (*put_prev_task) (struct rq *rq, struct task_struct *p, u64 now); |
866 | 866 | ||
867 | unsigned long (*load_balance) (struct rq *this_rq, int this_cpu, | 867 | unsigned long (*load_balance) (struct rq *this_rq, int this_cpu, |
diff --git a/kernel/sched.c b/kernel/sched.c index e51d75f4b4d7..b67a288a0f1f 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -3410,14 +3410,14 @@ pick_next_task(struct rq *rq, struct task_struct *prev, u64 now) | |||
3410 | * the fair class we can call that function directly: | 3410 | * the fair class we can call that function directly: |
3411 | */ | 3411 | */ |
3412 | if (likely(rq->nr_running == rq->cfs.nr_running)) { | 3412 | if (likely(rq->nr_running == rq->cfs.nr_running)) { |
3413 | p = fair_sched_class.pick_next_task(rq, now); | 3413 | p = fair_sched_class.pick_next_task(rq); |
3414 | if (likely(p)) | 3414 | if (likely(p)) |
3415 | return p; | 3415 | return p; |
3416 | } | 3416 | } |
3417 | 3417 | ||
3418 | class = sched_class_highest; | 3418 | class = sched_class_highest; |
3419 | for ( ; ; ) { | 3419 | for ( ; ; ) { |
3420 | p = class->pick_next_task(rq, now); | 3420 | p = class->pick_next_task(rq); |
3421 | if (p) | 3421 | if (p) |
3422 | return p; | 3422 | return p; |
3423 | /* | 3423 | /* |
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index fb4d614af2c3..0b23aaf074fa 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c | |||
@@ -859,7 +859,7 @@ static void check_preempt_curr_fair(struct rq *rq, struct task_struct *p) | |||
859 | __check_preempt_curr_fair(cfs_rq, &p->se, &curr->se, gran); | 859 | __check_preempt_curr_fair(cfs_rq, &p->se, &curr->se, gran); |
860 | } | 860 | } |
861 | 861 | ||
862 | static struct task_struct *pick_next_task_fair(struct rq *rq, u64 now) | 862 | static struct task_struct *pick_next_task_fair(struct rq *rq) |
863 | { | 863 | { |
864 | struct cfs_rq *cfs_rq = &rq->cfs; | 864 | struct cfs_rq *cfs_rq = &rq->cfs; |
865 | struct sched_entity *se; | 865 | struct sched_entity *se; |
diff --git a/kernel/sched_idletask.c b/kernel/sched_idletask.c index f69e083e0d96..9f4c28f858fe 100644 --- a/kernel/sched_idletask.c +++ b/kernel/sched_idletask.c | |||
@@ -13,7 +13,7 @@ static void check_preempt_curr_idle(struct rq *rq, struct task_struct *p) | |||
13 | resched_task(rq->idle); | 13 | resched_task(rq->idle); |
14 | } | 14 | } |
15 | 15 | ||
16 | static struct task_struct *pick_next_task_idle(struct rq *rq, u64 now) | 16 | static struct task_struct *pick_next_task_idle(struct rq *rq) |
17 | { | 17 | { |
18 | schedstat_inc(rq, sched_goidle); | 18 | schedstat_inc(rq, sched_goidle); |
19 | 19 | ||
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 60591e2512b1..c0b0d6237bb6 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c | |||
@@ -73,7 +73,7 @@ static void check_preempt_curr_rt(struct rq *rq, struct task_struct *p) | |||
73 | resched_task(rq->curr); | 73 | resched_task(rq->curr); |
74 | } | 74 | } |
75 | 75 | ||
76 | static struct task_struct *pick_next_task_rt(struct rq *rq, u64 now) | 76 | static struct task_struct *pick_next_task_rt(struct rq *rq) |
77 | { | 77 | { |
78 | struct rt_prio_array *array = &rq->rt.active; | 78 | struct rt_prio_array *array = &rq->rt.active; |
79 | struct task_struct *next; | 79 | struct task_struct *next; |