5 files changed, 11 insertions, 8 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 807b7888695a..3e78b9c61580 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -57,10 +57,11 @@ void litmus_exit_task(struct task_struct *tsk);
 #define get_rt_phase(t)         (tsk_rt(t)->task_params.phase)
 #define get_partition(t)        (tsk_rt(t)->task_params.cpu)
 #define get_priority(t)         (tsk_rt(t)->task_params.priority)
-#define get_class(t)        (tsk_rt(t)->task_params.cls)
+#define get_class(t)            (tsk_rt(t)->task_params.cls)
 
 /* job_param macros */
-#define get_exec_time(t)    (tsk_rt(t)->job_params.exec_time)
+#define get_job_no(t)           (tsk_rt(t)->job_params.job_no)
+#define get_exec_time(t)        (tsk_rt(t)->job_params.exec_time)
 #define get_deadline(t)         (tsk_rt(t)->job_params.deadline)
 #define get_release(t)          (tsk_rt(t)->job_params.release)
 #define get_lateness(t)         (tsk_rt(t)->job_params.lateness)
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index bf6c4cf4316c..2f992789affb 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -308,7 +308,6 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id,
         do {                                                            \
                 SCHED_TRACE(SCHED_TRACE_BASE_ID + 12,                   \
                         do_sched_trace_task_tardy, t);                  \
-                trace_litmus_task_tardy(t);                             \
         } while (0)
 
 #define QT_START lt_t _qt_start = litmus_clock()
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 81384327e850..1da1ec9a59b1 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -383,6 +383,9 @@ void litmus_exit_task(struct task_struct* tsk)
 {
         if (is_realtime(tsk)) {
                 sched_trace_task_completion(tsk, 1);
+                sched_trace_task_exit(tsk);
+                sched_trace_task_tardy(tsk);
+                printk(KERN_WARNING "Swear I'm doing \n");
 
                 litmus->task_exit(tsk);
 
diff --git a/litmus/preempt.c b/litmus/preempt.c
index 5704d0bf4c0b..92c5d1b26a13 100644
--- a/litmus/preempt.c
+++ b/litmus/preempt.c
@@ -26,10 +26,10 @@ void sched_state_will_schedule(struct task_struct* tsk)
                         set_sched_state(PICKED_WRONG_TASK);
                 else
                         set_sched_state(WILL_SCHEDULE);
-        } else
-                /* Litmus tasks should never be subject to a remote
-                 * set_tsk_need_resched(). */
-                BUG_ON(is_realtime(tsk));
+        } /* else */
+          /*    /\* Litmus tasks should never be subject to a remote */
+          /*     * set_tsk_need_resched(). *\/ */
+          /*    BUG_ON(is_realtime(tsk)); */
 #ifdef CONFIG_PREEMPT_STATE_TRACE
         TRACE_TASK(tsk, "set_tsk_need_resched() ret:%p\n",
                    __builtin_return_address(0));
diff --git a/litmus/sched_task_trace.c b/litmus/sched_task_trace.c
index 60a3e8e5c028..7194d2fe6c6f 100644
--- a/litmus/sched_task_trace.c
+++ b/litmus/sched_task_trace.c
@@ -231,7 +231,7 @@ feather_callback void do_sched_trace_task_exit(unsigned long id,
 {
         struct task_struct *t = (struct task_struct*) _task;
         const lt_t max_exec_time = tsk_rt(t)->max_exec_time;
-        const lt_t avg_exec_time = tsk_rt(t)->tot_exec_time / (get_rt_job(t) - 1);
+        const lt_t avg_exec_time = tsk_rt(t)->tot_exec_time / (get_job_no(t) - 1);
 
         struct st_event_record *rec = get_record(ST_TASK_EXIT, t);
         if (rec) {