1 files changed, 26 insertions, 8 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index 72c936d3e332..ee7ac71b12f8 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3916,7 +3916,7 @@ EXPORT_SYMBOL(sleep_on_timeout);
 void rt_mutex_setprio(struct task_struct *p, int prio)
 {
         unsigned long flags;
-        int oldprio, on_rq;
+        int oldprio, on_rq, running;
         struct rq *rq;
 
         BUG_ON(prio < 0 || prio > MAX_PRIO);
@@ -3926,8 +3926,12 @@ void rt_mutex_setprio(struct task_struct *p, int prio)
 
         oldprio = p->prio;
         on_rq = p->se.on_rq;
-        if (on_rq)
+        running = task_running(rq, p);
+        if (on_rq) {
                 dequeue_task(rq, p, 0);
+                if (running)
+                        p->sched_class->put_prev_task(rq, p);
+        }
 
         if (rt_prio(prio))
                 p->sched_class = &rt_sched_class;
@@ -3937,13 +3941,15 @@ void rt_mutex_setprio(struct task_struct *p, int prio)
         p->prio = prio;
 
         if (on_rq) {
+                if (running)
+                        p->sched_class->set_curr_task(rq);
                 enqueue_task(rq, p, 0);
                 /*
                  * Reschedule if we are currently running on this runqueue and
                  * our priority decreased, or if we are not currently running on
                  * this runqueue and our priority is higher than the current's
                  */
-                if (task_running(rq, p)) {
+                if (running) {
                         if (p->prio > oldprio)
                                 resched_task(rq->curr);
                 } else {
@@ -4149,7 +4155,7 @@ __setscheduler(struct rq *rq, struct task_struct *p, int policy, int prio)
 int sched_setscheduler(struct task_struct *p, int policy,
                        struct sched_param *param)
 {
-        int retval, oldprio, oldpolicy = -1, on_rq;
+        int retval, oldprio, oldpolicy = -1, on_rq, running;
         unsigned long flags;
         struct rq *rq;
 
@@ -4231,20 +4237,26 @@ recheck:
         }
         update_rq_clock(rq);
         on_rq = p->se.on_rq;
-        if (on_rq)
+        running = task_running(rq, p);
+        if (on_rq) {
                 deactivate_task(rq, p, 0);
+                if (running)
+                        p->sched_class->put_prev_task(rq, p);
+        }
 
         oldprio = p->prio;
         __setscheduler(rq, p, policy, param->sched_priority);
 
         if (on_rq) {
+                if (running)
+                        p->sched_class->set_curr_task(rq);
                 activate_task(rq, p, 0);
                 /*
                  * Reschedule if we are currently running on this runqueue and
                  * our priority decreased, or if we are not currently running on
                  * this runqueue and our priority is higher than the current's
                  */
-                if (task_running(rq, p)) {
+                if (running) {
                         if (p->prio > oldprio)
                                 resched_task(rq->curr);
                 } else {
@@ -6845,13 +6857,19 @@ static void sched_move_task(struct container_subsys *ss, struct container *cont,
         running = task_running(rq, tsk);
         on_rq = tsk->se.on_rq;
 
-        if (on_rq)
+        if (on_rq) {
                 dequeue_task(rq, tsk, 0);
+                if (unlikely(running))
+                        tsk->sched_class->put_prev_task(rq, tsk);
+        }
 
         set_task_cfs_rq(tsk);
 
-        if (on_rq)
+        if (on_rq) {
+                if (unlikely(running))
+                        tsk->sched_class->set_curr_task(rq);
                 enqueue_task(rq, tsk, 0);
+        }
 
 done:
         task_rq_unlock(rq, &flags);