FINAL BUG FIXED VERSION

2 files changed, 2 insertions, 3 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 22ce3da19245..fd8410aaabbf 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -122,7 +122,6 @@ struct edfsc_params {
         cont_domain_t *domain;
         struct task_struct *container_task;
         int id;
-        int can_release; //only used for containers
     // Moved these to the struct task_struct in include/linux/sched.h so that
     // the runtime can build
         //struct list_head qnode;
diff --git a/include/litmus/trace.h b/include/litmus/trace.h
index 2646136e3881..dbbd817d2bd1 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -140,8 +140,8 @@ feather_callback void save_cpu_task_latency(unsigned long event, unsigned long w
 #define TS_PLUGIN_SCHED_START           /* TIMESTAMP(120) */  /* currently unused */
 #define TS_PLUGIN_SCHED_END             /* TIMESTAMP(121) */
 
-#define TS_PLUGIN_TICK_START            /* TIMESTAMP(130) */
-#define TS_PLUGIN_TICK_END              /* TIMESTAMP(131) */
+#define TS_PLUGIN_TICK_START    /* CPU_TIMESTAMP(130) */
+#define TS_PLUGIN_TICK_END              /* CPU_TIMESTAMP(131) */
 
 #define TS_ENTER_NP_START               CPU_TIMESTAMP(140)
 #define TS_ENTER_NP_END                 CPU_TIMESTAMP(141)