Update memory protection flags. Comment-out some debug messages.

4 files changed, 12 insertions, 8 deletions

diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 91d6f4278de1..71d54ede2630 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -40,6 +40,7 @@
 #include <asm/ptrace.h>
 #include <asm/localtimer.h>
 
+#include <litmus/trace.h>
 #include <litmus/preempt.h>
 
 /*
diff --git a/include/litmus/color.h b/include/litmus/color.h
index 2f7e19cd4602..a018ce428461 100644
--- a/include/litmus/color.h
+++ b/include/litmus/color.h
@@ -86,8 +86,8 @@ int color_reclaim_pages_handler(struct ctl_table *, int, void __user *,
 int color_sched_in_task(struct task_struct*);
 int color_sched_out_task(struct task_struct*);
 
-#ifdef CONFIG_LOCKDEP
 #define LITMUS_LOCKDEP_NAME_MAX_LEN 50
+#ifdef CONFIG_LOCKDEP
 #define LOCKDEP_DYNAMIC_ALLOC(lock, key, name_buf, fmt, args...)        \
         do {                                                            \
                 snprintf(name_buf, LITMUS_LOCKDEP_NAME_MAX_LEN,         \
@@ -95,7 +95,6 @@ int color_sched_out_task(struct task_struct*);
                 lockdep_set_class_and_name(lock, key, name_buf);        \
         } while (0)
 #else
-#define LITMUS_LOCKDEP_NAME_MAX_LEN 0
 #define LOCKDEP_DYNAMIC_ALLOC(lock, key, name_buf, fmt, args)           \
         do { (void)(key); } while (0)
 #endif
diff --git a/litmus/color_dev.c b/litmus/color_dev.c
index 9edaf0ec7e41..4beb4383b3b3 100644
--- a/litmus/color_dev.c
+++ b/litmus/color_dev.c
@@ -48,7 +48,7 @@ static void mmap_common_vma_flags(struct vm_area_struct *vma)
          * don't care if it was touched or not. __S011 means RW access, but not
          * execute, and avoids copy-on-write behavior.
          * See protection_map in mmap.c.  */
-        vma->vm_page_prot = __S011;
+        vma->vm_page_prot = PAGE_SHARED;
 }
 
 /***********************************************************
diff --git a/litmus/color_queue.c b/litmus/color_queue.c
index c37aeb8c1389..0b87217a931a 100644
--- a/litmus/color_queue.c
+++ b/litmus/color_queue.c
@@ -10,10 +10,12 @@
 #include <litmus/trace.h>
 
 /* Uncomment to debug. */
+#if 0
 #define QTRACE(q, fmt, args...) TRACE_CUR("q.phase: %llu  q.way: %d  " \
                                 "q.nr_cpus: %d  q.at_barrier: %d  " fmt, \
                                 q.phase, q.way, q.nr_cpus, q.at_barrier, \
                                 ## args)
+#endif
 
 #ifndef QTRACE
 #define QTRACE(q, fmt, args...) do { } while (0)
@@ -84,8 +86,8 @@ static void cpu_add_work(struct color_queue_request *req)
         struct list_head *new = &req->list;
         list_add_tail(new, &entry->enqueue);
         entry->nr_work++;
-        TRACE_CUR("cpu->nr_work: %d  added work request pointer %p\n",
-                        entry->nr_work, req);
+        //TRACE_CUR("cpu->nr_work: %d  added work request pointer %p\n",
+        //              entry->nr_work, req);
 }
 
 /*
@@ -101,7 +103,7 @@ static void color_page_info_add_work(struct color_page_info *info, void *vaddr_s
         const int cpu = smp_processor_id();
         int i;
 
-        TRACE_CUR("adding work for color_page_info: 0x%p\n", info);
+        //TRACE_CUR("adding work for color_page_info: 0x%p\n", info);
 
         for (i = 0; i < COLOR_REQUESTS_PER_PAGE; i++) {
                 struct color_queue_request *req = &info->requests[i];
@@ -131,9 +133,11 @@ int color_queue_enqueue_read(struct task_struct *ts)
 
         TS_CQ_ENQUEUE_READ_START;
 
+#if 0
         TRACE_CUR("enqueue read prev: %p  next: %p\n",
                         tsk_rt(ts)->color_page_info_list.prev,
                         tsk_rt(ts)->color_page_info_list.next);
+#endif
 
         list_for_each_entry(cur_info,
                         &tsk_rt(ts)->color_page_info_list,
@@ -207,7 +211,7 @@ static void do_work_son(struct color_queue_request *request)
                         WARN(1, "Idle work in the queue!\n");
                         break;
                 case COLOR_QUEUE_READ:
-                        TRACE_CUR("doing work for CPU %d\n", request->cpu);
+                        //TRACE_CUR("doing work for CPU %d\n", request->cpu);
                         do_work_read(request);
                         break;
         }
@@ -218,7 +222,7 @@ static void do_work_son(struct color_queue_request *request)
         entry = &per_cpu(cpu_entries, request->cpu);
         raw_spin_lock(&entry->lock);
         entry->nr_work--;
-        TRACE_CUR("after doing work, cpu->nr_work: %d\n", entry->nr_work);
+        //TRACE_CUR("after doing work, cpu->nr_work: %d\n", entry->nr_work);
         raw_spin_unlock(&entry->lock);
 
         /* work is done, set it idle */