Use a typedef for the color number.

1 files changed, 13 insertions, 17 deletions

diff --git a/litmus/color_dev.c b/litmus/color_dev.c
index 414f4d7f1082..e1404142c18a 100644
--- a/litmus/color_dev.c
+++ b/litmus/color_dev.c
@@ -146,37 +146,33 @@ out:
 #define vma_nr_pages(vma) \
         ({unsigned long v = ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT); v;})
 
-#define next_color(c) ({unsigned long _x = (c + 1) % nr_colors; _x;})
-
 static int do_map_colored_pages(struct vm_area_struct *vma)
 {
         const unsigned long nr_pages = vma_nr_pages(vma);
-        unsigned long mapped;
-        uint16_t *cur_color;
+        unsigned long nr_mapped;
+        color_t *cur_color;
         int err;
 
         TRACE_CUR(ALLOC_NAME ": allocating %lu pages\n", nr_pages);
 
-        for (mapped = 0, cur_color = tsk_rt(current)->color_ctrl_page->colors;
-                        mapped < nr_pages;
-                        mapped++, cur_color++)
+        for (   nr_mapped = 0,
+                cur_color = tsk_rt(current)->color_ctrl_page->colors;
+                nr_mapped < nr_pages;
+                nr_mapped++, cur_color++)
         {
-                const unsigned long color = *cur_color;
-                const unsigned long addr = vma->vm_start + (mapped << PAGE_SHIFT);
-                struct page *page = get_colored_page(color);
+                const unsigned long this_color = *cur_color;
+                const unsigned long addr = vma->vm_start + (nr_mapped << PAGE_SHIFT);
+                struct page *page = get_colored_page(this_color);
 
                 if (!page) {
                         TRACE_CUR(ALLOC_NAME ": Could not get page with "
-                                        " color %lu.\n", color);
+                                        " color %lu.\n", this_color);
                         /* TODO unmap mapped pages */
                         break;
                 }
-                TRACE_CUR(ALLOC_NAME ": insert page (pa:0x%llx, pfn:%lu, "
-                                "color:%lu count:%d LRU:%d) at 0x%lx "
-                                "(prot: 0x%lx)\n",
-                                page_to_phys(page), page_to_pfn(page), color,
-                                page_count(page), PageLRU(page), addr,
-                                pgprot_val(vma->vm_page_prot));
+                TRACE_CUR(ALLOC_NAME ": insert page (pa:0x%10llx, pfn:%8lu, "
+                                "color:%3lu) at 0x%lx\n", page_to_phys(page),
+                                page_to_pfn(page), this_color, addr);
                 err = vm_insert_page(vma, addr, page);
                 if (err) {
                         TRACE_CUR(ALLOC_NAME ": vm_insert_page() failed "