2.6.24.4-rc1

 kernel

diff --git a/kernel/sched.c b/kernel/sched.c
index e76b11c..5ba5db9 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4028,11 +4028,10 @@ void rt_mutex_setprio(struct task_struct *p, int prio)
    oldprio = p->prio;
    on_rq = p->se.on_rq;
    running = task_current(rq, p);
-   if (on_rq) {
+   if (on_rq)
       dequeue_task(rq, p, 0);
-      if (running)
-         p->sched_class->put_prev_task(rq, p);
-   }
+   if (running)
+      p->sched_class->put_prev_task(rq, p);
 
    if (rt_prio(prio))
       p->sched_class = &rt_sched_class;
@@ -4041,9 +4040,9 @@ void rt_mutex_setprio(struct task_struct *p, int prio)
 
    p->prio = prio;
 
+   if (running)
+      p->sched_class->set_curr_task(rq);
    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
@@ -4339,18 +4338,17 @@ recheck:
    update_rq_clock(rq);
    on_rq = p->se.on_rq;
    running = task_current(rq, p);
-   if (on_rq) {
+   if (on_rq)
       deactivate_task(rq, p, 0);
-      if (running)
-         p->sched_class->put_prev_task(rq, p);
-   }
+   if (running)
+      p->sched_class->put_prev_task(rq, p);
 
    oldprio = p->prio;
    __setscheduler(rq, p, policy, param->sched_priority);
 
+   if (running)
+      p->sched_class->set_curr_task(rq);
    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
@@ -7110,19 +7108,17 @@ void sched_move_task(struct task_struct *tsk)
    running = task_current(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);
-   }
+   if (unlikely(running))
+      tsk->sched_class->put_prev_task(rq, tsk);
 
    set_task_cfs_rq(tsk, task_cpu(tsk));
 
-   if (on_rq) {
-      if (unlikely(running))
-         tsk->sched_class->set_curr_task(rq);
+   if (unlikely(running))
+      tsk->sched_class->set_curr_task(rq);
+   if (on_rq)
       enqueue_task(rq, tsk, 0);
-   }
 
 done:
    task_rq_unlock(rq, &flags);