Removed ARM-specific hacks which disabled less common mixed-criticality features.wip-mc

1 files changed, 16 insertions, 12 deletions

diff --git a/litmus/preempt.c b/litmus/preempt.c
index 8f1304afea26..26c6c7a929d9 100644
--- a/litmus/preempt.c
+++ b/litmus/preempt.c
@@ -22,9 +22,10 @@ void sched_state_will_schedule(struct task_struct* tsk)
          */
         if (likely(task_cpu(tsk) == smp_processor_id())) {
                 VERIFY_SCHED_STATE(TASK_SCHEDULED | SHOULD_SCHEDULE | TASK_PICKED | WILL_SCHEDULE);
-                if (is_in_sched_state(TASK_PICKED | PICKED_WRONG_TASK))
+                if (is_in_sched_state(TASK_PICKED | PICKED_WRONG_TASK)) {
+                        TRACE_TASK(tsk, "Wrong task\n");
                         set_sched_state(PICKED_WRONG_TASK);
-                else
+                } else
                         set_sched_state(WILL_SCHEDULE);
         } /* else */
           /*    /\* Litmus tasks should never be subject to a remote */
@@ -32,8 +33,8 @@ void sched_state_will_schedule(struct task_struct* tsk)
           /*    BUG_ON(is_realtime(tsk)); */
 
 #ifdef CONFIG_PREEMPT_STATE_TRACE
-        TRACE_TASK(tsk, "set_tsk_need_resched() ret:%p\n",
-                   __builtin_return_address(0));
+        STRACE("%d: set_tsk_need_resched() ret:%p\n",
+              tsk->pid, __builtin_return_address(0));
 #endif
 }
 
@@ -69,9 +70,11 @@ void litmus_reschedule(int cpu)
          * is not aware of the need to reschedule at this point. */
 
         /* is a context switch in progress? */
-        if (cpu_is_in_sched_state(cpu, TASK_PICKED))
+        if (cpu_is_in_sched_state(cpu, TASK_PICKED)) {
+                STRACE("Transition onto wrong task\n");
                 picked_transition_ok = sched_state_transition_on(
                         cpu, TASK_PICKED, PICKED_WRONG_TASK);
+        }
 
         if (!picked_transition_ok &&
             cpu_is_in_sched_state(cpu, TASK_SCHEDULED)) {
@@ -90,17 +93,18 @@ void litmus_reschedule(int cpu)
                         smp_send_reschedule(cpu);
         }
 
-        TRACE_STATE("%s picked-ok:%d sched-ok:%d\n",
-                    __FUNCTION__,
-                    picked_transition_ok,
-                    scheduled_transition_ok);
+        STRACE("%s picked-ok:%d sched-ok:%d\n",
+               __FUNCTION__,
+               picked_transition_ok,
+               scheduled_transition_ok);
 }
 
 void litmus_reschedule_local(void)
 {
-        if (is_in_sched_state(TASK_PICKED))
+        if (is_in_sched_state(TASK_PICKED)) {
+                STRACE("Rescheduling into wrong task\n");
                 set_sched_state(PICKED_WRONG_TASK);
-        else if (is_in_sched_state(TASK_SCHEDULED | SHOULD_SCHEDULE)) {
+        } else if (is_in_sched_state(TASK_SCHEDULED | SHOULD_SCHEDULE)) {
                 set_sched_state(WILL_SCHEDULE);
                 set_tsk_need_resched(current);
         }
@@ -111,7 +115,7 @@ void litmus_reschedule_local(void)
 void sched_state_plugin_check(void)
 {
         if (!is_in_sched_state(TASK_PICKED | PICKED_WRONG_TASK)) {
-                TRACE("!!!! plugin did not call sched_state_task_picked()!"
+                STRACE("!!!! plugin did not call sched_state_task_picked()!"
                       "Calling sched_state_task_picked() is mandatory---fix this.\n");
                 set_sched_state(TASK_PICKED);
         }