aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/sched.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 0ecfdd134f77..05ce3f54e815 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -853,8 +853,7 @@ static void enqueue_task(struct rq *rq, struct task_struct *p, int wakeup)
853 p->se.on_rq = 1; 853 p->se.on_rq = 1;
854} 854}
855 855
856static void 856static void dequeue_task(struct rq *rq, struct task_struct *p, int sleep)
857dequeue_task(struct rq *rq, struct task_struct *p, int sleep, u64 now)
858{ 857{
859 p->sched_class->dequeue_task(rq, p, sleep); 858 p->sched_class->dequeue_task(rq, p, sleep);
860 p->se.on_rq = 0; 859 p->se.on_rq = 0;
@@ -949,7 +948,7 @@ deactivate_task(struct rq *rq, struct task_struct *p, int sleep, u64 now)
949 if (p->state == TASK_UNINTERRUPTIBLE) 948 if (p->state == TASK_UNINTERRUPTIBLE)
950 rq->nr_uninterruptible++; 949 rq->nr_uninterruptible++;
951 950
952 dequeue_task(rq, p, sleep, now); 951 dequeue_task(rq, p, sleep);
953 dec_nr_running(p, rq); 952 dec_nr_running(p, rq);
954} 953}
955 954
@@ -3922,7 +3921,7 @@ void rt_mutex_setprio(struct task_struct *p, int prio)
3922 oldprio = p->prio; 3921 oldprio = p->prio;
3923 on_rq = p->se.on_rq; 3922 on_rq = p->se.on_rq;
3924 if (on_rq) 3923 if (on_rq)
3925 dequeue_task(rq, p, 0, now); 3924 dequeue_task(rq, p, 0);
3926 3925
3927 if (rt_prio(prio)) 3926 if (rt_prio(prio))
3928 p->sched_class = &rt_sched_class; 3927 p->sched_class = &rt_sched_class;
@@ -3978,7 +3977,7 @@ void set_user_nice(struct task_struct *p, long nice)
3978 } 3977 }
3979 on_rq = p->se.on_rq; 3978 on_rq = p->se.on_rq;
3980 if (on_rq) { 3979 if (on_rq) {
3981 dequeue_task(rq, p, 0, now); 3980 dequeue_task(rq, p, 0);
3982 dec_load(rq, p); 3981 dec_load(rq, p);
3983 } 3982 }
3984 3983