1 files changed, 3 insertions, 11 deletions

diff --git a/litmus/sched_edf_hsb.c b/litmus/sched_edf_hsb.c
index 0a1316abdf5c..adbcc2551280 100644
--- a/litmus/sched_edf_hsb.c
+++ b/litmus/sched_edf_hsb.c
@@ -593,7 +593,7 @@ static void requeue_server(server_t *server, lt_t now)
                         hrt_server = container_of(server, hrt_server_t, server);
                         hrt_server->ready = 1;
                         hrt_server->no_slack = 0;
-                        sched_trace_action(task, SERVER_RELEASED_ACTION);
+                        sched_trace_action(NULL, SERVER_RELEASED_ACTION);
                 } else if (server->type == S_BE) {
                         TRACE_SERVER_SUB(server, "BE added to ready");
                         bheap_insert(server_order, &be_ready_servers, server->hn);
@@ -612,7 +612,7 @@ static void reclaim_slack(server_t *slack)
         server_t *donator = server_slack(slack);
 
         /* SRT servers do not ever reclaim slack */
-        sched_trace_action(NULL, SLACK_RECLAIMED_ACTION);
+        sched_trace_action(NULL, SLACK_RECLAIM_ACTION);
 
         exec = slack->wcet - slack->budget;
         TRACE_SERVER_SUB(donator, "reclaiming %llu slack", TIME(exec));
@@ -694,7 +694,7 @@ static noinline void unlink_server(cpu_entry_t *entry, int requeue)
 
         if (server->type == S_SLACK && server->deadline) {
                 add_slack(server);
-                sched_trace_action(entry->linked, SLACK_STOPPED_ACTION);
+                sched_trace_action(entry->linked, SLACK_STOP_ACTION);
 
                 /* Donator needs to absorb slack execution time */
                 reclaim_slack(server);
@@ -969,7 +969,6 @@ static server_t* next_eligible_slack_server(void)
  */
 static struct task_struct* next_eligible_slack(void)
 {
-        lt_t now = litmus_clock();
         struct task_struct *next = get_candidate(slack_candidates.next);
 
         if (!next) {
@@ -1501,7 +1500,6 @@ static void check_for_hrt_preempt(cpu_entry_t *entry)
 {
         hrt_server_t *hrt_server = &entry->hrt_server;
         struct task_struct *next_hrt = next_eligible_hrt(hrt_server);
-        struct task_struct *curr = entry->linked;
 
         if (next_hrt &&
             (!entry->linked || !is_hrt(entry->linked) ||
@@ -1510,11 +1508,6 @@ static void check_for_hrt_preempt(cpu_entry_t *entry)
 
                 preempt(entry, next_hrt, &hrt_server->server, 1);
 
-                /* We might have just kicked off something. Check to see if it
-                 * preempts anything.
-                 */
-                /* if (curr && !is_hrt(curr)) */
-                /*      check_for_global_preempt(); */
         } else {
                 TRACE_SERVER_SUB(&hrt_server->server, "not HRT preempting");
         }
@@ -1715,7 +1708,6 @@ static void job_completion(cpu_entry_t *entry, struct task_struct* task)
  */
 static void server_completed(server_t *server, struct task_struct *task)
 {
-        lt_t now = litmus_clock();
         hrt_server_t *hrt_server;
         cpu_entry_t *entry = task_linked_entry(task);