aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/sched.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index e4b69fae2f33..00a59b090e6f 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -6065,7 +6065,7 @@ void rt_mutex_setprio(struct task_struct *p, int prio)
6065 unsigned long flags; 6065 unsigned long flags;
6066 int oldprio, on_rq, running; 6066 int oldprio, on_rq, running;
6067 struct rq *rq; 6067 struct rq *rq;
6068 const struct sched_class *prev_class = p->sched_class; 6068 const struct sched_class *prev_class;
6069 6069
6070 BUG_ON(prio < 0 || prio > MAX_PRIO); 6070 BUG_ON(prio < 0 || prio > MAX_PRIO);
6071 6071
@@ -6073,6 +6073,7 @@ void rt_mutex_setprio(struct task_struct *p, int prio)
6073 update_rq_clock(rq); 6073 update_rq_clock(rq);
6074 6074
6075 oldprio = p->prio; 6075 oldprio = p->prio;
6076 prev_class = p->sched_class;
6076 on_rq = p->se.on_rq; 6077 on_rq = p->se.on_rq;
6077 running = task_current(rq, p); 6078 running = task_current(rq, p);
6078 if (on_rq) 6079 if (on_rq)
@@ -6292,7 +6293,7 @@ static int __sched_setscheduler(struct task_struct *p, int policy,
6292{ 6293{
6293 int retval, oldprio, oldpolicy = -1, on_rq, running; 6294 int retval, oldprio, oldpolicy = -1, on_rq, running;
6294 unsigned long flags; 6295 unsigned long flags;
6295 const struct sched_class *prev_class = p->sched_class; 6296 const struct sched_class *prev_class;
6296 struct rq *rq; 6297 struct rq *rq;
6297 int reset_on_fork; 6298 int reset_on_fork;
6298 6299
@@ -6406,6 +6407,7 @@ recheck:
6406 p->sched_reset_on_fork = reset_on_fork; 6407 p->sched_reset_on_fork = reset_on_fork;
6407 6408
6408 oldprio = p->prio; 6409 oldprio = p->prio;
6410 prev_class = p->sched_class;
6409 __setscheduler(rq, p, policy, param->sched_priority); 6411 __setscheduler(rq, p, policy, param->sched_priority);
6410 6412
6411 if (running) 6413 if (running)