Use NR_CPUS_EDF_OS instead of NR_CPUS to allow proper interface with liblitmus

2 files changed, 6 insertions, 5 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index d250e538a63e..bc3bbd07ef26 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -42,6 +42,7 @@ typedef enum {
  * migrate on 2 (contiguous) CPU only. NR_CPUS_EDF_FM = 2.
  */
 #define NR_CPUS_EDF_FM  2
+#define NR_CPUS_EDF_OS 24
 
 struct edffm_params {
         /* EDF-fm where can a migratory task execute? */
@@ -67,14 +68,14 @@ struct edfos_params {
         /* Whether this task is a migrating task*/
         unsigned int migrat;
         /* Time of next subtask release or deadline */
-        int heap_data[NR_CPUS];
+        int heap_data[NR_CPUS_EDF_OS];
         /* Fraction of this task exec_cost that each CPU should handle.
          * We keep the fraction divided in num/denom : a matrix of
-         * (NR_CPUS rows) x (2 columns).
+         * (NR_CPUS_EDF_OS rows) x (2 columns).
          * The first column is the numerator of the fraction.
          * The second column is the denominator.
          */
-        lt_t            fraction[NR_CPUS][2];
+        lt_t            fraction[NR_CPUS_EDF_OS][2];
         struct bheap release_queue;
         struct bheap ready_queue;
 };
@@ -297,7 +298,7 @@ struct rt_param {
                  * number of jobs handled by this cpu
                  * (to determine next cpu for a migrating task)
                  */
-                unsigned int    cpu_job_no[NR_CPUS];
+                unsigned int    cpu_job_no[NR_CPUS_EDF_OS];
 
                 /* EDF-WM runtime information */
                 struct {
diff --git a/litmus/sched_edf_os.c b/litmus/sched_edf_os.c
index a4b3cdeb1a07..dac2f0e8ca3b 100644
--- a/litmus/sched_edf_os.c
+++ b/litmus/sched_edf_os.c
@@ -489,7 +489,7 @@ static void edfos_task_new(struct task_struct * t, int on_rq, int running)
         if (edfos_params(t).migrat) {
                 bheap_init(&edfos_params(t).release_queue);
                 bheap_init(&edfos_params(t).ready_queue);
-                for (i = 0; i < NR_CPUS; i++) {
+                for (i = 0; i < NR_CPUS_EDF_OS; i++) {
                         if (edfos_params(t).fraction[i][0] > 0) {
                                 has_cpu = 1;
                                 edfos_params(t).heap_data[i] =