aboutsummaryrefslogtreecommitdiffstats
path: root/litmus/litmus.c
diff options
context:
space:
mode:
Diffstat (limited to 'litmus/litmus.c')
-rw-r--r--litmus/litmus.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 301390148d02..40340dfa9d67 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -302,7 +302,12 @@ static void reinit_litmus_state(struct task_struct* p, int restore)
302 /* We probably should not be inheriting any task's priority 302 /* We probably should not be inheriting any task's priority
303 * at this point in time. 303 * at this point in time.
304 */ 304 */
305 WARN_ON(p->rt_param.inh_task); 305 WARN_ON(p->rt_param.eff_prio);
306
307#ifdef CONFIG_LITMUS_NESTED_LOCKING
308 WARN_ON(p->rt_param.local_prio);
309 WARN_ON(p->rt_param.trans_prio);
310#endif
306 311
307 /* Cleanup everything else. */ 312 /* Cleanup everything else. */
308 memset(&p->rt_param, 0, sizeof(p->rt_param)); 313 memset(&p->rt_param, 0, sizeof(p->rt_param));
@@ -468,7 +473,9 @@ void litmus_exec(void)
468 struct task_struct* p = current; 473 struct task_struct* p = current;
469 474
470 if (is_realtime(p)) { 475 if (is_realtime(p)) {
471 WARN_ON(p->rt_param.inh_task); 476 WARN_ON(p->rt_param.eff_prio);
477 WARN_ON(p->rt_param.local_prio);
478 WARN_ON(p->rt_param.trans_prio);
472 if (tsk_rt(p)->ctrl_page) { 479 if (tsk_rt(p)->ctrl_page) {
473 free_page((unsigned long) tsk_rt(p)->ctrl_page); 480 free_page((unsigned long) tsk_rt(p)->ctrl_page);
474 tsk_rt(p)->ctrl_page = NULL; 481 tsk_rt(p)->ctrl_page = NULL;