Minor changes

1 files changed, 9 insertions, 10 deletions

diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index 5ad386f66c18..aff5018c8bcc 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -182,13 +182,13 @@ static int mc_edf_ready_order(struct bheap_node* a, struct bheap_node* b)
 static void mc_edf_domain_init(rt_domain_t* rt, check_resched_needed_t resched,
                       release_jobs_t release)
 {
-        rt_domain_init(rt,  mc_edf_ready_order, resched, release);
+        rt_domain_init(rt, mc_edf_ready_order, resched, release);
 }
 
 
 /* END clone of edf_common.c*/
 
-static rt_domain_t *proper_domain(struct task_struct* task)
+static rt_domain_t* proper_domain(struct task_struct* task)
 {
         switch (task->rt_param.task_params.crit)
         {
@@ -200,8 +200,10 @@ static rt_domain_t *proper_domain(struct task_struct* task)
                         break;
                 case 2:
                         return &crit_c;
+                        break;
                 case 3:
                         return &crit_d;
+                        break;
                 default:
                         /*Should never get here*/
                         BUG();
@@ -357,9 +359,6 @@ static noinline void requeue(struct task_struct* task)
         BUG_ON(!task || !is_realtime(task));
         /* sanity check before insertion */
         BUG_ON(is_queued(task));
-        /* Should never call on a level A task.*/
-        /*Allowing this for now*/
-/*      BUG_ON(task->rt_param.task_params.crit == CRIT_LEVEL_A);*/
 
         if (is_released(task, litmus_clock()))
                 __add_ready(proper_domain(task), task);
@@ -428,16 +427,16 @@ static void check_for_a_preemption(cpu_entry_t* entry)
 }
 
 /* Check for level B preemption*/
-static void check_for_pedf_preemption(cpu_entry_t* entry)
+static void check_for_b_preemption(cpu_entry_t* entry)
 {
         struct task_struct *task;
         rt_domain_t *queue;
 
         queue = remote_b_queue(entry->cpu);
-        TRACE("check_for_pedf_preemption triggered\n");
+        TRACE("check_for_b_preemption triggered\n");
         if (mc_edf_preemption_needed(queue, entry->linked)) {
                 task = __take_ready(queue);
-                TRACE("check_for_pedf_preemption: attempting to link task %d to %d\n",
+                TRACE("check_for_b_preemption: attempting to link task %d to %d\n",
                         task->pid, entry->cpu);
                 if (entry->linked)
                         requeue(entry->linked);
@@ -458,7 +457,7 @@ static noinline void mc_job_arrival(struct task_struct* task)
                 check_for_a_preemption(remote_cpu_entry(get_partition(task)));
         }
         else if (task->rt_param.task_params.crit == CRIT_LEVEL_B){
-                check_for_pedf_preemption(remote_cpu_entry(
+                check_for_b_preemption(remote_cpu_entry(
                         get_partition(task)));
         }
         else if (task->rt_param.task_params.crit == CRIT_LEVEL_C){
@@ -481,7 +480,7 @@ static void mc_release_jobs(rt_domain_t* rt, struct bheap* tasks)
 
         for (i = 0; i < NR_CPUS; i++){
                 if (rt == remote_b_queue(i)){
-                        check_for_pedf_preemption(remote_cpu_entry(i));
+                        check_for_b_preemption(remote_cpu_entry(i));
                 }
                 else if (rt == remote_a_queue(i)){
                         check_for_a_preemption(remote_cpu_entry(i));