diff options
Diffstat (limited to 'litmus/srp.c')
-rw-r--r-- | litmus/srp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/litmus/srp.c b/litmus/srp.c index 6e670f9138..71639b9916 100644 --- a/litmus/srp.c +++ b/litmus/srp.c | |||
@@ -78,7 +78,7 @@ struct srp_semaphore { | |||
78 | int cpu; /* cpu associated with this "semaphore" and resource */ | 78 | int cpu; /* cpu associated with this "semaphore" and resource */ |
79 | }; | 79 | }; |
80 | 80 | ||
81 | #define ceiling2sem(c) container_of(c, struct srp_semaphore, ceiling) | 81 | #define ceiling2sem(c) container_of(c, struct srp_semaphore, ceiling) |
82 | 82 | ||
83 | static int srp_exceeds_ceiling(struct task_struct* first, | 83 | static int srp_exceeds_ceiling(struct task_struct* first, |
84 | struct srp* srp) | 84 | struct srp* srp) |
@@ -86,7 +86,7 @@ static int srp_exceeds_ceiling(struct task_struct* first, | |||
86 | return list_empty(&srp->ceiling) || | 86 | return list_empty(&srp->ceiling) || |
87 | get_rt_period(first) < system_ceiling(srp)->period || | 87 | get_rt_period(first) < system_ceiling(srp)->period || |
88 | (get_rt_period(first) == system_ceiling(srp)->period && | 88 | (get_rt_period(first) == system_ceiling(srp)->period && |
89 | first->pid < system_ceiling(srp)->pid) || | 89 | first->pid < system_ceiling(srp)->pid) || |
90 | ceiling2sem(system_ceiling(srp))->owner == first; | 90 | ceiling2sem(system_ceiling(srp))->owner == first; |
91 | } | 91 | } |
92 | 92 | ||
@@ -176,7 +176,7 @@ static void do_srp_down(struct srp_semaphore* sem) | |||
176 | } | 176 | } |
177 | 177 | ||
178 | static void do_srp_up(struct srp_semaphore* sem) | 178 | static void do_srp_up(struct srp_semaphore* sem) |
179 | { | 179 | { |
180 | /* Determine new system priority ceiling for this CPU. */ | 180 | /* Determine new system priority ceiling for this CPU. */ |
181 | WARN_ON(!in_list(&sem->ceiling.list)); | 181 | WARN_ON(!in_list(&sem->ceiling.list)); |
182 | if (in_list(&sem->ceiling.list)) | 182 | if (in_list(&sem->ceiling.list)) |
@@ -296,7 +296,7 @@ void srp_ceiling_block(void) | |||
296 | do_ceiling_block(tsk); | 296 | do_ceiling_block(tsk); |
297 | TRACE_CUR("finally exceeds system ceiling.\n"); | 297 | TRACE_CUR("finally exceeds system ceiling.\n"); |
298 | } else | 298 | } else |
299 | TRACE_CUR("is not priority ceiling blocked\n"); | 299 | TRACE_CUR("is not priority ceiling blocked\n"); |
300 | preempt_enable(); | 300 | preempt_enable(); |
301 | } | 301 | } |
302 | 302 | ||