Merge branch 'prop/sched_fork' into wip-aux-tasks

Conflicts:
	kernel/sched.c

1 files changed, 11 insertions, 7 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index 0e4b3d40cd29..251c89eaf24e 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3169,22 +3169,26 @@ static inline void post_schedule(struct rq *rq)
 asmlinkage void schedule_tail(struct task_struct *prev)
         __releases(rq->lock)
 {
-        struct rq *rq = this_rq();
+        struct rq *rq;
+        
+        preempt_disable();
+        
+        rq = this_rq();
+        finish_task_switch(rq, prev);
 
         sched_trace_task_switch_to(current);
 
-        if (sched_state_validate_switch()) {
-                WARN_ON(1);
-        }
-
-        finish_task_switch(rq, prev);
-
         /*
          * FIXME: do we need to worry about rq being invalidated by the
          * task_switch?
          */
         post_schedule(rq);
 
+        if (sched_state_validate_switch())
+                litmus_reschedule_local();
+
+        preempt_enable();
+
 #ifdef __ARCH_WANT_UNLOCKED_CTXSW
         /* In this case, finish_task_switch does not reenable preemption */
         preempt_enable();