Tasks specify colors and pages when allocating pages

1 files changed, 3 insertions, 5 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 7dfcd333bd18..35d810a08c9b 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -5,8 +5,6 @@
 #ifndef _LINUX_RT_PARAM_H_
 #define _LINUX_RT_PARAM_H_
 
-#include <litmus/color.h>
-
 /* Litmus time type. */
 typedef unsigned long long lt_t;
 
@@ -73,8 +71,6 @@ struct control_page {
 
         /* locking overhead tracing: time stamp prior to system call */
         uint64_t ts_syscall_start; /* Feather-Trace cycles */
-
-        int requests[NUM_COLORS];
 };
 
 #ifndef __KERNEL__
@@ -90,9 +86,11 @@ struct control_page {
 #endif /* ifndef __KERNEL__ */
 
 typedef uint8_t color_t;
-#define COLORS_PER_CONTROL_PAGE (PAGE_SIZE / sizeof(color_t))
+#define COLORS_PER_CONTROL_PAGE (PAGE_SIZE / (2 * sizeof(color_t)))
 struct color_ctrl_page {
         color_t colors[COLORS_PER_CONTROL_PAGE];
+        /* must be same type to guarantee equal array sizes */
+        color_t pages[COLORS_PER_CONTROL_PAGE];
 };
 
 /* don't export internal data structures to user space (liblitmus) */