deadlock patch

1 files changed, 8 insertions, 3 deletions

diff --git a/litmus/sched_mc2.c b/litmus/sched_mc2.c
index aa3d999d60ed..a000242d5045 100644
--- a/litmus/sched_mc2.c
+++ b/litmus/sched_mc2.c
@@ -1231,13 +1231,16 @@ static void mc2_task_resume(struct task_struct  *tsk)
 
         TRACE_TASK(tsk, "thread wakes up at %llu\n", litmus_clock());
 
-        local_irq_save(flags);
+        //local_irq_save(flags);
+        TRACE_TASK(tsk, "preemptible?? %d\n", preemptible());
+        preempt_disable();
         tinfo = get_mc2_state(tsk);
         if (tinfo->cpu != -1)
                 state = cpu_state_for(tinfo->cpu);
         else
                 state = local_cpu_state();
-
+        preempt_enable();
+        
         /* 9/20/2015 fix
         raw_spin_lock(&_global_env.lock);
         */
@@ -1271,6 +1274,7 @@ static void mc2_task_resume(struct task_struct  *tsk)
                 }
 
                 raw_spin_lock(&state->lock);
+                local_irq_save(flags);
                 /* Assumption: litmus_clock() is synchronized across cores,
                  * since we might not actually be executing on tinfo->cpu
                  * at the moment. */
@@ -1290,13 +1294,14 @@ static void mc2_task_resume(struct task_struct  *tsk)
                 //task_arrives(state, tsk);
                 /* NOTE: drops state->lock */
                 TRACE_TASK(tsk, "mc2_resume()\n");
+                local_irq_restore(flags);
                 mc2_update_timer_and_unlock(state);     
         } else {
                 TRACE_TASK(tsk, "resume event ignored, still scheduled\n");
                 //raw_spin_unlock(&_global_env.lock);
         }
 
-        local_irq_restore(flags);
+        //local_irq_restore(flags);
         
         //gmp_free_passed_event();
         resume_legacy_task_model_updates(tsk);