diff options
-rw-r--r-- | include/linux/sched.h | 2 | ||||
-rw-r--r-- | kernel/sched.c | 2 | ||||
-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, 5 insertions, 5 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index c6ad4071c791..9afb66a49358 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -862,7 +862,7 @@ struct sched_class { | |||
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); | 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); |
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, |
868 | struct rq *busiest, | 868 | struct rq *busiest, |
diff --git a/kernel/sched.c b/kernel/sched.c index 4f9f9e9d7265..664440160485 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -3470,7 +3470,7 @@ need_resched_nonpreemptible: | |||
3470 | if (unlikely(!rq->nr_running)) | 3470 | if (unlikely(!rq->nr_running)) |
3471 | idle_balance(cpu, rq); | 3471 | idle_balance(cpu, rq); |
3472 | 3472 | ||
3473 | prev->sched_class->put_prev_task(rq, prev, now); | 3473 | prev->sched_class->put_prev_task(rq, prev); |
3474 | next = pick_next_task(rq, prev); | 3474 | next = pick_next_task(rq, prev); |
3475 | 3475 | ||
3476 | sched_info_switch(prev, next); | 3476 | sched_info_switch(prev, next); |
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 0b23aaf074fa..103327b4275d 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c | |||
@@ -878,7 +878,7 @@ static struct task_struct *pick_next_task_fair(struct rq *rq) | |||
878 | /* | 878 | /* |
879 | * Account for a descheduled task: | 879 | * Account for a descheduled task: |
880 | */ | 880 | */ |
881 | static void put_prev_task_fair(struct rq *rq, struct task_struct *prev, u64 now) | 881 | static void put_prev_task_fair(struct rq *rq, struct task_struct *prev) |
882 | { | 882 | { |
883 | struct sched_entity *se = &prev->se; | 883 | struct sched_entity *se = &prev->se; |
884 | struct cfs_rq *cfs_rq; | 884 | struct cfs_rq *cfs_rq; |
diff --git a/kernel/sched_idletask.c b/kernel/sched_idletask.c index 9f4c28f858fe..3503fb2d9f96 100644 --- a/kernel/sched_idletask.c +++ b/kernel/sched_idletask.c | |||
@@ -33,7 +33,7 @@ dequeue_task_idle(struct rq *rq, struct task_struct *p, int sleep) | |||
33 | spin_lock_irq(&rq->lock); | 33 | spin_lock_irq(&rq->lock); |
34 | } | 34 | } |
35 | 35 | ||
36 | static void put_prev_task_idle(struct rq *rq, struct task_struct *prev, u64 now) | 36 | static void put_prev_task_idle(struct rq *rq, struct task_struct *prev) |
37 | { | 37 | { |
38 | } | 38 | } |
39 | 39 | ||
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index c0b0d6237bb6..dcdcad632fd9 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c | |||
@@ -92,7 +92,7 @@ static struct task_struct *pick_next_task_rt(struct rq *rq) | |||
92 | return next; | 92 | return next; |
93 | } | 93 | } |
94 | 94 | ||
95 | static void put_prev_task_rt(struct rq *rq, struct task_struct *p, u64 now) | 95 | static void put_prev_task_rt(struct rq *rq, struct task_struct *p) |
96 | { | 96 | { |
97 | update_curr_rt(rq); | 97 | update_curr_rt(rq); |
98 | p->se.exec_start = 0; | 98 | p->se.exec_start = 0; |