diff options
Diffstat (limited to 'include/litmus/rt_param.h')
-rw-r--r-- | include/litmus/rt_param.h | 8 |
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 @@ | |||
5 | #ifndef _LINUX_RT_PARAM_H_ | 5 | #ifndef _LINUX_RT_PARAM_H_ |
6 | #define _LINUX_RT_PARAM_H_ | 6 | #define _LINUX_RT_PARAM_H_ |
7 | 7 | ||
8 | #include <litmus/color.h> | ||
9 | |||
10 | /* Litmus time type. */ | 8 | /* Litmus time type. */ |
11 | typedef unsigned long long lt_t; | 9 | typedef unsigned long long lt_t; |
12 | 10 | ||
@@ -73,8 +71,6 @@ struct control_page { | |||
73 | 71 | ||
74 | /* locking overhead tracing: time stamp prior to system call */ | 72 | /* locking overhead tracing: time stamp prior to system call */ |
75 | uint64_t ts_syscall_start; /* Feather-Trace cycles */ | 73 | uint64_t ts_syscall_start; /* Feather-Trace cycles */ |
76 | |||
77 | int requests[NUM_COLORS]; | ||
78 | }; | 74 | }; |
79 | 75 | ||
80 | #ifndef __KERNEL__ | 76 | #ifndef __KERNEL__ |
@@ -90,9 +86,11 @@ struct control_page { | |||
90 | #endif /* ifndef __KERNEL__ */ | 86 | #endif /* ifndef __KERNEL__ */ |
91 | 87 | ||
92 | typedef uint8_t color_t; | 88 | typedef uint8_t color_t; |
93 | #define COLORS_PER_CONTROL_PAGE (PAGE_SIZE / sizeof(color_t)) | 89 | #define COLORS_PER_CONTROL_PAGE (PAGE_SIZE / (2 * sizeof(color_t))) |
94 | struct color_ctrl_page { | 90 | struct color_ctrl_page { |
95 | color_t colors[COLORS_PER_CONTROL_PAGE]; | 91 | color_t colors[COLORS_PER_CONTROL_PAGE]; |
92 | /* must be same type to guarantee equal array sizes */ | ||
93 | color_t pages[COLORS_PER_CONTROL_PAGE]; | ||
96 | }; | 94 | }; |
97 | 95 | ||
98 | /* don't export internal data structures to user space (liblitmus) */ | 96 | /* don't export internal data structures to user space (liblitmus) */ |