1 files changed, 12 insertions, 3 deletions

diff --git a/litmus/color_queue.c b/litmus/color_queue.c
index 6543811fd06..a1030f5dc19 100644
--- a/litmus/color_queue.c
+++ b/litmus/color_queue.c
@@ -99,6 +99,8 @@ static void color_page_info_add_work(struct color_page_info *info, void *vaddr_s
 {
         int i;
 
+        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];
                 void *work_vaddr = vaddr_start + i * COLOR_QUEUE_REQ_SIZE;
@@ -125,6 +127,10 @@ void color_queue_enqueue_read(struct task_struct *ts)
 {
         struct color_page_info *cur_info;
 
+        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);
+
         list_for_each_entry(cur_info,
                         &tsk_rt(ts)->color_page_info_list,
                         list)
@@ -218,7 +224,9 @@ static void wait_next_phase(void)
                          * set up the lockdown value and updated the queue phase.
                          */
                         entry->phase = color_queue.phase;
-                        QTRACE(color_queue, "moving on to next phase\n");
+                        QTRACE(color_queue,
+                                        "cpu->phase: %d advances to a higher phase\n",
+                                        entry->phase);
                         raw_spin_unlock(&color_queue.lock);
                         return;
                 }
@@ -243,9 +251,10 @@ static void wait_next_phase(void)
                         color_queue.way = next_way;
                         color_queue.at_barrier = 0;
                         color_queue.phase++;
-                        QTRACE(color_queue, "moving on to start on the next way\n");
+                        QTRACE(color_queue, "bumped the phase and way\n");
                         raw_spin_unlock(&color_queue.lock);
-                        return;
+                } if (color_queue.nr_cpus < color_queue.at_barrier) {
+                        BUG();
                 } else {
                         /* Wait for work from the last phase to complete. */
                         QTRACE(color_queue, "still waiting for others\n");