1 files changed, 8 insertions, 12 deletions

diff --git a/include/litmus/sched_mc.h b/include/litmus/sched_mc.h
index 1d491ce6a31a..f0526e0d5589 100644
--- a/include/litmus/sched_mc.h
+++ b/include/litmus/sched_mc.h
@@ -16,11 +16,6 @@ struct mc_task {
         int lvl_a_eligible;
 };
 
-struct mc_job {
-        int is_ghost:1;
-        lt_t ghost_budget;
-};
-
 #ifdef __KERNEL__
 /*
  * These are used only in the kernel. Userspace programs like RTSpin won't see
@@ -28,19 +23,19 @@ struct mc_job {
  */
 struct mc_data {
         struct mc_task mc_task;
-        struct mc_job mc_job;
 };
 
 #define tsk_mc_data(t)   (tsk_rt(t)->mc_data)
 #define tsk_mc_crit(t)   (tsk_mc_data(t) ? tsk_mc_data(t)->mc_task.crit : CRIT_LEVEL_C)
-#define is_ghost(t)      (tsk_mc_data(t)->mc_job.is_ghost)
+#define is_ghost(t)      (get_rt_job(t) < get_user_job(t))
 
-#define TS "(%s/%d:%d:%s)"
+#define TS "(%s/%d:%d:%d:%s)"
 #define TA(t) (t) ? tsk_mc_data(t) ? is_ghost(t) ? "ghost" : t->comm \
-                                                 : t->comm : "NULL", \
-              (t) ? t->pid : 1,                                 \
-              (t) ? t->rt_param.job_params.job_no : 1,          \
-              (t && get_task_domain(t)) ? get_task_domain(t)->name : ""
+                                                 : t->comm : "NULL",    \
+                (t) ? t->pid : 1,                                       \
+                (t) ? get_rt_job(t) : 1,                                \
+                (t) ? get_user_job(t) : 1,                              \
+                (t && get_task_domain(t)) ? get_task_domain(t)->name : ""
 #define STRACE(fmt, args...) \
         sched_trace_log_message("%d P%d      [%s@%s:%d]: " fmt, \
                                 TRACE_ARGS,  ## args)
@@ -128,6 +123,7 @@ lt_t mc_ce_timer_callback_common(domain_t*);
 void mc_ce_release_at_common(struct task_struct*, lt_t);
 long mc_ce_activate_plugin_common(void);
 long mc_ce_deactivate_plugin_common(void);
+void mc_ce_job_completion(struct domain *dom, struct task_struct *ts);
 
 #endif /* __KERNEL__ */