1 files changed, 27 insertions, 11 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index ca1f76ba7773..a030d4514cdc 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2839,14 +2839,14 @@ prepare_task_switch(struct rq *rq, struct task_struct *prev,
  * with the lock held can cause deadlocks; see schedule() for
  * details.)
  */
-static void finish_task_switch(struct rq *rq, struct task_struct *prev)
+static int finish_task_switch(struct rq *rq, struct task_struct *prev)
         __releases(rq->lock)
 {
         struct mm_struct *mm = rq->prev_mm;
         long prev_state;
-#ifdef CONFIG_SMP
         int post_schedule = 0;
 
+#ifdef CONFIG_SMP
         if (current->sched_class->needs_post_schedule)
                 post_schedule = current->sched_class->needs_post_schedule(rq);
 #endif
@@ -2868,10 +2868,6 @@ static void finish_task_switch(struct rq *rq, struct task_struct *prev)
         finish_arch_switch(prev);
         perf_counter_task_sched_in(current, cpu_of(rq));
         finish_lock_switch(rq, prev);
-#ifdef CONFIG_SMP
-        if (post_schedule)
-                current->sched_class->post_schedule(rq);
-#endif
 
         fire_sched_in_preempt_notifiers(current);
         if (mm)
@@ -2884,6 +2880,8 @@ static void finish_task_switch(struct rq *rq, struct task_struct *prev)
                 kprobe_flush_task(prev);
                 put_task_struct(prev);
         }
+
+        return post_schedule;
 }
 
 /**
@@ -2894,8 +2892,15 @@ asmlinkage void schedule_tail(struct task_struct *prev)
         __releases(rq->lock)
 {
         struct rq *rq = this_rq();
+        int post_schedule;
+
+        post_schedule = finish_task_switch(rq, prev);
+
+#ifdef CONFIG_SMP
+        if (post_schedule)
+                current->sched_class->post_schedule(rq);
+#endif
 
-        finish_task_switch(rq, prev);
 #ifdef __ARCH_WANT_UNLOCKED_CTXSW
         /* In this case, finish_task_switch does not reenable preemption */
         preempt_enable();
@@ -2908,7 +2913,7 @@ asmlinkage void schedule_tail(struct task_struct *prev)
  * context_switch - switch to the new MM and the new
  * thread's register state.
  */
-static inline void
+static inline int
 context_switch(struct rq *rq, struct task_struct *prev,
                struct task_struct *next)
 {
@@ -2955,7 +2960,7 @@ context_switch(struct rq *rq, struct task_struct *prev,
          * CPUs since it called schedule(), thus the 'rq' on its stack
          * frame will be invalid.
          */
-        finish_task_switch(this_rq(), prev);
+        return finish_task_switch(this_rq(), prev);
 }
 
 /*
@@ -5366,6 +5371,7 @@ asmlinkage void __sched schedule(void)
 {
         struct task_struct *prev, *next;
         unsigned long *switch_count;
+        int post_schedule = 0;
         struct rq *rq;
         int cpu;
 
@@ -5416,15 +5422,25 @@ need_resched_nonpreemptible:
                 rq->curr = next;
                 ++*switch_count;
 
-                context_switch(rq, prev, next); /* unlocks the rq */
+                post_schedule = context_switch(rq, prev, next); /* unlocks the rq */
                 /*
                  * the context switch might have flipped the stack from under
                  * us, hence refresh the local variables.
                  */
                 cpu = smp_processor_id();
                 rq = cpu_rq(cpu);
-        } else
+        } else {
+#ifdef CONFIG_SMP
+                if (current->sched_class->needs_post_schedule)
+                        post_schedule = current->sched_class->needs_post_schedule(rq);
+#endif
                 spin_unlock_irq(&rq->lock);
+        }
+
+#ifdef CONFIG_SMP
+        if (post_schedule)
+                current->sched_class->post_schedule(rq);
+#endif
 
         if (unlikely(reacquire_kernel_lock(current) < 0))
                 goto need_resched_nonpreemptible;