diff options
Diffstat (limited to 'include/litmus')
-rw-r--r-- | include/litmus/aux_tasks.h | 4 | ||||
-rw-r--r-- | include/litmus/litmus.h | 4 | ||||
-rw-r--r-- | include/litmus/rt_param.h | 4 | ||||
-rw-r--r-- | include/litmus/sched_plugin.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/include/litmus/aux_tasks.h b/include/litmus/aux_tasks.h index 8e50ac85b082..3bb6b26fef09 100644 --- a/include/litmus/aux_tasks.h +++ b/include/litmus/aux_tasks.h | |||
@@ -3,8 +3,6 @@ | |||
3 | 3 | ||
4 | struct task_struct; | 4 | struct task_struct; |
5 | 5 | ||
6 | #define MAGIC_AUX_TASK_PERIOD ~((lt_t)0) | ||
7 | |||
8 | /* admit an aux task with default parameters */ | 6 | /* admit an aux task with default parameters */ |
9 | //int admit_aux_task(struct task_struct *t); | 7 | //int admit_aux_task(struct task_struct *t); |
10 | 8 | ||
@@ -30,4 +28,4 @@ int aux_task_owner_increase_priority(struct task_struct *t); | |||
30 | /* call when an aux_owner decreases its priority */ | 28 | /* call when an aux_owner decreases its priority */ |
31 | int aux_task_owner_decrease_priority(struct task_struct *t); | 29 | int aux_task_owner_decrease_priority(struct task_struct *t); |
32 | 30 | ||
33 | #endif \ No newline at end of file | 31 | #endif |
diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h index f9829167294d..db2987a24686 100644 --- a/include/litmus/litmus.h +++ b/include/litmus/litmus.h | |||
@@ -184,8 +184,10 @@ static inline int request_exit_np_atomic(struct task_struct *t) | |||
184 | * retry loop here since tasks might exploit that to | 184 | * retry loop here since tasks might exploit that to |
185 | * keep the kernel busy indefinitely. */ | 185 | * keep the kernel busy indefinitely. */ |
186 | } | 186 | } |
187 | } else | 187 | } |
188 | else { | ||
188 | return 0; | 189 | return 0; |
190 | } | ||
189 | } | 191 | } |
190 | 192 | ||
191 | #else | 193 | #else |
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h index 2a6c70f1dd37..c45ba23d7650 100644 --- a/include/litmus/rt_param.h +++ b/include/litmus/rt_param.h | |||
@@ -284,11 +284,11 @@ struct rt_param { | |||
284 | struct litmus_lock* blocked_lock; | 284 | struct litmus_lock* blocked_lock; |
285 | #endif | 285 | #endif |
286 | 286 | ||
287 | 287 | ||
288 | #ifdef CONFIG_LITMUS_LOCKING | 288 | #ifdef CONFIG_LITMUS_LOCKING |
289 | unsigned int is_aux_task:1; | 289 | unsigned int is_aux_task:1; |
290 | unsigned int has_aux_tasks:1; | 290 | unsigned int has_aux_tasks:1; |
291 | 291 | ||
292 | struct list_head aux_task_node; | 292 | struct list_head aux_task_node; |
293 | struct binheap_node aux_task_owner_node; | 293 | struct binheap_node aux_task_owner_node; |
294 | #endif | 294 | #endif |
diff --git a/include/litmus/sched_plugin.h b/include/litmus/sched_plugin.h index bd75e7c09a10..65736b2a9199 100644 --- a/include/litmus/sched_plugin.h +++ b/include/litmus/sched_plugin.h | |||
@@ -150,7 +150,7 @@ struct sched_plugin { | |||
150 | allocate_lock_t allocate_lock; | 150 | allocate_lock_t allocate_lock; |
151 | increase_prio_t increase_prio; | 151 | increase_prio_t increase_prio; |
152 | decrease_prio_t decrease_prio; | 152 | decrease_prio_t decrease_prio; |
153 | 153 | ||
154 | __increase_prio_t __increase_prio; | 154 | __increase_prio_t __increase_prio; |
155 | __decrease_prio_t __decrease_prio; | 155 | __decrease_prio_t __decrease_prio; |
156 | #endif | 156 | #endif |