2 files changed, 21 insertions, 20 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index b741645c4e59..74210f3b362e 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -62,12 +62,8 @@ struct edffm_params {
 };
 
 struct edfos_params {
-        /* EDF-os where can a migratory task execute? */
-        unsigned int    cpus[NR_CPUS];
         /* Whether this task is a migrating task*/
         unsigned int migrat;
-        /* ID of the first or only CPU*/
-        unsigned int first_cpu;
         /* Time of next subtask release or deadline */
         int heap_data[NR_CPUS];
         /* Fraction of this task exec_cost that each CPU should handle.
diff --git a/litmus/sched_edf_os.c b/litmus/sched_edf_os.c
index d263f8ca7faf..1c633b591412 100644
--- a/litmus/sched_edf_os.c
+++ b/litmus/sched_edf_os.c
@@ -258,27 +258,29 @@ static void update_job_counter(struct task_struct *t)
 }
 
 
-static int compute_pfair_deadline(unsigned int wt_num, unsigned int wt_den,
+static int compute_pfair_deadline(lt_t wt_num, lt_t wt_den,
                                   unsigned int job_no)
 {       
-        unsigned int num, den, dead;
+        lt_t num;
         num = job_no * wt_den;
-        den = wt_num;
-        dead = num / den;
-        if (num % den > 0)
-                dead++;
-        return dead;
+        if (do_div(num, wt_num))
+                num++;
+        return (int)num;
 }
 
-static int compute_pfair_release(unsigned int wt_num, unsigned int wt_den,
+static int compute_pfair_release(lt_t wt_num, lt_t wt_den,
                                  unsigned int job_no)
 {
-        return ((job_no - 1) * wt_den) / wt_num;
+        lt_t num;
+        num = (job_no - 1) * wt_den;
+        do_div(num, wt_num);
+        return (int)num;
 }
 
 static int next_cpu_for_job(struct task_struct *t)
 {
-        unsigned int cpu, next_rel;
+        unsigned int cpu;
+        lt_t next_rel;
         struct bheap_node* node;
         BUG_ON(!is_migrat_task(t));
         
@@ -483,12 +485,15 @@ static void edfos_task_new(struct task_struct * t, int on_rq, int running)
         
         for (i = 0; i < NR_CPUS; i++)
         {
-                edfos_params(t).heap_data[i] = compute_pfair_deadline(
-                                edfos_params(t).fraction[0][i],
-                                edfos_params(t).fraction[1][i],
-                                0);
-                bheap_add(fakepfair_ready_order, &edfos_params(t).ready_queue,
-                          &edfos_params(t).heap_data[i], GFP_ATOMIC);
+                if (edfos_params(t).fraction[0][i] > 0)
+                {
+                        edfos_params(t).heap_data[i] = compute_pfair_deadline(
+                                        edfos_params(t).fraction[0][i],
+                                        edfos_params(t).fraction[1][i], 0);
+                        bheap_add(fakepfair_ready_order,
+                                  &edfos_params(t).ready_queue,
+                                  &edfos_params(t).heap_data[i], GFP_ATOMIC);
+                }
         }
         /* Pick the first CPU to execute on. */
         change_migrat_cpu_if_needed(t);