Bugfixed for ARM systems.

Compile with CONFIG_NP_SECTION=y

Signed-off-by: Christopher Kenna <cjk@cs.unc.edu>

5 files changed, 28 insertions, 23 deletions

diff --git a/include/litmus/clock.h b/include/litmus/clock.h
index d6f1cfd2ca60..9b285db7f60c 100644
--- a/include/litmus/clock.h
+++ b/include/litmus/clock.h
@@ -24,6 +24,8 @@ static inline s64 litmus_cycles_to_ns(cycles_t cycles)
 
 #elif defined(CONFIG_CPU_V7) && !defined(CONFIG_HW_PERF_EVENTS)
 
+#include <asm/timex.h>
+
 static inline cycles_t v7_get_cycles (void)
 {
         u32 value;
diff --git a/litmus/color.c b/litmus/color.c
index 8b160258e81d..2ba67f1dc06f 100644
--- a/litmus/color.c
+++ b/litmus/color.c
@@ -18,6 +18,7 @@
 #include <litmus/clock.h>
 #include <litmus/color_queue.h>
 #include <litmus/way_tracker.h>
+#include <litmus/trace.h>
 
 #define PAGES_PER_COLOR 1024
 
diff --git a/litmus/dgl.c b/litmus/dgl.c
index 85250676572d..f6580a9234dc 100644
--- a/litmus/dgl.c
+++ b/litmus/dgl.c
@@ -114,9 +114,13 @@ static void print_state(struct dgl *dgl)
         sched_trace_log_message("\n");
         STRACE2("\t\tDGL: requests: %d\n", dgl->requests);
 
-        for (i = 0; i < dgl->num_resources; i++) {
+        for (i = 0; i < dgl->num_resources; ++i) {
                 resource = &dgl->resources[i];
 
+                if (!resource) {
+                        STRACE2("\tResource %d is null!\n", i);
+                }
+
                 if (!list_empty(&resource->waiting)    ||
                     !list_empty(&resource->will_wait)  ||
                     !list_empty(&resource->acquired)   ||
@@ -125,6 +129,7 @@ static void print_state(struct dgl *dgl)
                         print_resource(dgl, resource);
                 }
         }
+        STRACE2("Dump complete\n");
         sched_trace_log_message("\n");
 }
 
@@ -132,7 +137,7 @@ static void print_state(struct dgl *dgl)
 #define BUG_DUMP(dgl, cond)                     \
         do {                                    \
         if (cond) {                             \
-                TRACE("BAD: %s", #cond);        \
+                STRACE2("BAD: %s", #cond);      \
                 print_state(dgl);               \
                 BUG();                          \
         }} while(0)
@@ -694,8 +699,6 @@ void add_group_req(struct dgl *dgl, struct dgl_group_req *greq, int cpu)
                         }
                 }
         }
-
-        print_state(dgl);
 }
 
 /**
@@ -715,7 +718,6 @@ void update_group_req(struct dgl *dgl, struct dgl_group_req *greq)
 
         BUG_DUMP(dgl, arr_to_bool(dgl, greq->blocked) &&
                  dgl->acquired[greq->cpu] == greq);
-        print_state(dgl);
 }
 
 /**
@@ -773,7 +775,6 @@ void remove_group_req(struct dgl *dgl, struct dgl_group_req *greq)
         }
 
         --dgl->requests;
-        print_state(dgl);
 }
 
 /**
diff --git a/litmus/lockdown.c b/litmus/lockdown.c
index bd24b5839bc9..d0dee3ae2d83 100644
--- a/litmus/lockdown.c
+++ b/litmus/lockdown.c
@@ -23,6 +23,9 @@
 #include <litmus/debug_trace.h>
 #include <litmus/lockdown.h>
 
+#ifndef litmus_cycles_to_ns
+#define litmus_cycles_to_ns(x) 0
+#endif
 
 #define MAX_NR_WAYS     16
 
diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index c8677f688f7c..2d0e8da92377 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -62,11 +62,7 @@ static raw_spinlock_t dgl_lock;
 
 DEFINE_PER_CPU(struct cpu_entry, cpus);
 static int interrupt_cpu;
-#ifdef CONFIG_NP_SECTION
 #define has_resources(t, c)   (tsk_rt(t)->req == group_lock.acquired[c])
-#else
-#define has_resources(t, c)   (1)
-#endif
 
 #define domain_data(dom)  (container_of(dom, struct domain_data, domain))
 #define is_global(dom)    (domain_data(dom)->heap)
@@ -211,7 +207,7 @@ static int mc_preempt_needed(struct domain *dom, struct task_struct* curr)
  * Update crit entry position in a global heap. Caller must hold
  * @ce's domain lock.
  */
-static inline void update_crit_position(struct crit_entry *ce)
+static void update_crit_position(struct crit_entry *ce)
 {
         struct bheap *heap;
         if (is_global(ce->domain)) {
@@ -240,7 +236,7 @@ static void fix_crit_position(struct crit_entry *ce)
  * Return next CPU which should preempted or NULL if the domain has no
  * preemptable CPUs. Caller must hold the @dom lock.
  */
-static inline struct crit_entry* lowest_prio_cpu(struct domain *dom)
+static struct crit_entry* lowest_prio_cpu(struct domain *dom)
 {
         struct bheap *heap = domain_data(dom)->heap;
         struct bheap_node* hn;
@@ -1003,6 +999,8 @@ static void mc_task_new(struct task_struct *t, int on_rq, int running)
                 dgl_group_req_init(&group_lock, req);
                 for (i = 0; ccp->pages[i]; ++i)
                         set_req(&group_lock, req, ccp->colors[i], ccp->pages[i]);
+        } else {
+                BUG_ON(CRIT_LEVEL_B == tsk_mc_crit(t));
         }
 
         /* Setup job params */
@@ -1108,12 +1106,12 @@ static long mc_admit_task(struct task_struct* task)
                 ret = -EINVAL;
                 goto out;
         }
-        if (crit < CRIT_LEVEL_C && get_partition(task) == interrupt_cpu) {
-                printk(KERN_WARNING "Tried to admit partitioned task on "
-                       "the interrupt master\n");
-                ret = -EINVAL;
-                goto out;
-        }
+        /* if (crit < CRIT_LEVEL_C && get_partition(task) == interrupt_cpu) { */
+        /*      printk(KERN_WARNING "Tried to admit partitioned task on " */
+        /*             "the interrupt master\n"); */
+        /*      ret = -EINVAL; */
+        /*      goto out; */
+        /* } */
         if (crit == CRIT_LEVEL_A) {
                 ret = mc_ce_admit_task_common(task);
                 if (ret)
@@ -1529,8 +1527,8 @@ static void mc_release_ts(lt_t time)
         level = CRIT_LEVEL_A;
         strcpy(name, "LVL-A");
         for_each_online_cpu(cpu) {
-                if (cpu == interrupt_cpu)
-                        continue;
+                /* if (cpu == interrupt_cpu) */
+                /*      continue; */
                 entry = &per_cpu(cpus, cpu);
                 sched_trace_container_param(++cont_id, (const char*)&name);
                 ce = &entry->crit_entries[level];
@@ -1541,8 +1539,8 @@ static void mc_release_ts(lt_t time)
         level = CRIT_LEVEL_B;
         strcpy(name, "LVL-B");
         for_each_online_cpu(cpu) {
-                if (cpu == interrupt_cpu)
-                        continue;
+                /* if (cpu == interrupt_cpu) */
+                /*      continue; */
                 entry = &per_cpu(cpus, cpu);
                 sched_trace_container_param(++cont_id, (const char*)&name);
                 ce = &entry->crit_entries[level];
@@ -1631,7 +1629,7 @@ static void init_global_domain(struct domain_data *dom_data, enum crit_level lev
         }
 }
 
-static inline void init_edf_domain(struct domain *dom, rt_domain_t *rt,
+static void init_edf_domain(struct domain *dom, rt_domain_t *rt,
                                    enum crit_level prio, int is_partitioned, int cpu)
 {
         pd_domain_init(dom, rt, edf_ready_order, NULL,