From: Andrew Morton Signed-off-by: Andrew Morton --- kernel/sched.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff -puN kernel/sched.c~revert-sched-redundant-reschedule-when-set_user_nice-boosts-a-prio-of-a-task-from-the-expired-array-update kernel/sched.c --- a/kernel/sched.c~revert-sched-redundant-reschedule-when-set_user_nice-boosts-a-prio-of-a-task-from-the-expired-array-update +++ a/kernel/sched.c @@ -4102,8 +4102,7 @@ void rt_mutex_setprio(struct task_struct * our priority decreased, or if our priority became higher * than the current's. */ - if (TASK_PREEMPTS_CURR(p, rq) || - (delta > 0 && task_running(rq, p))) + if (TASK_PREEMPTS_CURR(p, rq) || (delta > 0 && task_running(rq, p))) resched_task(rq->curr); } task_rq_unlock(rq, &flags); @@ -4155,8 +4154,7 @@ void set_user_nice(struct task_struct *p * our priority decreased, or if our priority became higher * than the current's. */ - if (TASK_PREEMPTS_CURR(p, rq) || - (delta > 0 && task_running(rq, p))) + if (TASK_PREEMPTS_CURR(p, rq) || (delta > 0 && task_running(rq, p))) resched_task(rq->curr); } out_unlock: @@ -4386,8 +4384,7 @@ recheck: * our priority decreased, or our priority became higher * than the current's. */ - if (TASK_PREEMPTS_CURR(p, rq) || - (task_running(rq, p) && p->prio > oldprio)) + if (TASK_PREEMPTS_CURR(p, rq) || (task_running(rq, p) && p->prio > oldprio)) resched_task(rq->curr); } __task_rq_unlock(rq); _