1 files changed, 7 insertions, 1 deletions

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index ce69fc7eaf19..aae08cedd75e 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3724,7 +3724,8 @@ out_unlock:
 
 void set_user_nice(struct task_struct *p, long nice)
 {
-        int old_prio, delta, queued;
+        bool queued, running;
+        int old_prio, delta;
         struct rq_flags rf;
         struct rq *rq;
 
@@ -3746,8 +3747,11 @@ void set_user_nice(struct task_struct *p, long nice)
                 goto out_unlock;
         }
         queued = task_on_rq_queued(p);
+        running = task_current(rq, p);
         if (queued)
                 dequeue_task(rq, p, DEQUEUE_SAVE);
+        if (running)
+                put_prev_task(rq, p);
 
         p->static_prio = NICE_TO_PRIO(nice);
         set_load_weight(p);
@@ -3764,6 +3768,8 @@ void set_user_nice(struct task_struct *p, long nice)
                 if (delta < 0 || (delta > 0 && task_running(rq, p)))
                         resched_curr(rq);
         }
+        if (running)
+                set_curr_task(rq, p);
 out_unlock:
         task_rq_unlock(rq, p, &rf);
 }