1 files changed, 9 insertions, 6 deletions

diff --git a/litmus/sched_edf_hsb.c b/litmus/sched_edf_hsb.c
index d89364fdb582..d176efca648b 100644
--- a/litmus/sched_edf_hsb.c
+++ b/litmus/sched_edf_hsb.c
@@ -340,6 +340,9 @@ static noinline void check_donate_slack(server_t *donator, struct task_struct *w
 
         TRACE_SERVER_SUB(donator, "checking donation");
 
+        if (!slack)
+                return;
+
         /* Donating small amounts of slack will result in excess migrations */
         if (donator->budget < SLACK_MIN)
                 return;
@@ -1330,8 +1333,7 @@ static void remove_from_ready(server_t *server, struct task_struct *task,
                 }
         } else {
                 slack = server_slack(server);
-                BUG_ON(!slack);
-                if (head_in_list(&slack->list)) {
+                if (slack && head_in_list(&slack->list)) {
                         remove_slack(slack);
                 }
                 if (server->type == S_BE) {
@@ -1456,7 +1458,7 @@ static noinline void check_for_slack_preempt(struct task_struct *task,
         }
 
         /* The server's slack is currently being run */
-        if (is_server_linked(slack)) {
+        if (slack && is_server_linked(slack)) {
                 entry = &per_cpu(cpu_entries, slack->cpu);
                 slack_task = server_task(slack);
 
@@ -2466,11 +2468,12 @@ static int __init init_edf_hsb(void)
                 idle_slack = server_alloc(GFP_ATOMIC);
                 server_init(idle_slack, &server_domain,
                             IDLE_SLACK_BASE + cpu,
-                            ULLONG_MAX, ULLONG_MAX, 1);
-                idle_slack->deadline = ULLONG_MAX;
-                idle_slack->budget = ULLONG_MAX;
+                            LLONG_MAX, LLONG_MAX, 1);
+                idle_slack->deadline = LLONG_MAX;
+                idle_slack->budget = LLONG_MAX;
                 idle_slack->job_no = 1;
                 idle_slack->release = 1;
+                idle_slack->type = S_SLACK;
                 add_slack(idle_slack);
 
                 entry->cpu = cpu;