aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 86e751a19d6b..0ecfdd134f77 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -846,8 +846,7 @@ static void set_load_weight(struct task_struct *p)
846 p->se.load.inv_weight = prio_to_wmult[p->static_prio - MAX_RT_PRIO]; 846 p->se.load.inv_weight = prio_to_wmult[p->static_prio - MAX_RT_PRIO];
847} 847}
848 848
849static void 849static void enqueue_task(struct rq *rq, struct task_struct *p, int wakeup)
850enqueue_task(struct rq *rq, struct task_struct *p, int wakeup, u64 now)
851{ 850{
852 sched_info_queued(p); 851 sched_info_queued(p);
853 p->sched_class->enqueue_task(rq, p, wakeup); 852 p->sched_class->enqueue_task(rq, p, wakeup);
@@ -920,7 +919,7 @@ static void activate_task(struct rq *rq, struct task_struct *p, int wakeup)
920 if (p->state == TASK_UNINTERRUPTIBLE) 919 if (p->state == TASK_UNINTERRUPTIBLE)
921 rq->nr_uninterruptible--; 920 rq->nr_uninterruptible--;
922 921
923 enqueue_task(rq, p, wakeup, now); 922 enqueue_task(rq, p, wakeup);
924 inc_nr_running(p, rq); 923 inc_nr_running(p, rq);
925} 924}
926 925
@@ -937,7 +936,7 @@ static inline void activate_idle_task(struct task_struct *p, struct rq *rq)
937 if (p->state == TASK_UNINTERRUPTIBLE) 936 if (p->state == TASK_UNINTERRUPTIBLE)
938 rq->nr_uninterruptible--; 937 rq->nr_uninterruptible--;
939 938
940 enqueue_task(rq, p, 0, now); 939 enqueue_task(rq, p, 0);
941 inc_nr_running(p, rq); 940 inc_nr_running(p, rq);
942} 941}
943 942
@@ -3933,7 +3932,7 @@ void rt_mutex_setprio(struct task_struct *p, int prio)
3933 p->prio = prio; 3932 p->prio = prio;
3934 3933
3935 if (on_rq) { 3934 if (on_rq) {
3936 enqueue_task(rq, p, 0, now); 3935 enqueue_task(rq, p, 0);
3937 /* 3936 /*
3938 * Reschedule if we are currently running on this runqueue and 3937 * Reschedule if we are currently running on this runqueue and
3939 * our priority decreased, or if we are not currently running on 3938 * our priority decreased, or if we are not currently running on
@@ -3990,7 +3989,7 @@ void set_user_nice(struct task_struct *p, long nice)
3990 delta = p->prio - old_prio; 3989 delta = p->prio - old_prio;
3991 3990
3992 if (on_rq) { 3991 if (on_rq) {
3993 enqueue_task(rq, p, 0, now); 3992 enqueue_task(rq, p, 0);
3994 inc_load(rq, p); 3993 inc_load(rq, p);
3995 /* 3994 /*
3996 * If the task increased its priority or is running and 3995 * If the task increased its priority or is running and