diff options
Diffstat (limited to 'litmus/litmus.c')
-rw-r--r--[-rwxr-xr-x] | litmus/litmus.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/litmus/litmus.c b/litmus/litmus.c index 065ef7d3192a..3b8017397e80 100755..100644 --- a/litmus/litmus.c +++ b/litmus/litmus.c | |||
@@ -397,14 +397,14 @@ static void reinit_litmus_state(struct task_struct* p, int restore) | |||
397 | /* We probably should not have any tasklets executing for | 397 | /* We probably should not have any tasklets executing for |
398 | * us at this time. | 398 | * us at this time. |
399 | */ | 399 | */ |
400 | WARN_ON(p->rt_param.cur_klitirqd); | 400 | WARN_ON(p->rt_param.cur_klmirqd); |
401 | WARN_ON(atomic_read(&p->rt_param.klitirqd_sem_stat) == HELD); | 401 | WARN_ON(atomic_read(&p->rt_param.klmirqd_sem_stat) == HELD); |
402 | 402 | ||
403 | if(p->rt_param.cur_klitirqd) | 403 | if(p->rt_param.cur_klmirqd) |
404 | flush_pending(p->rt_param.cur_klitirqd, p); | 404 | flush_pending(p->rt_param.cur_klmirqd, p); |
405 | 405 | ||
406 | if(atomic_read(&p->rt_param.klitirqd_sem_stat) == HELD) | 406 | if(atomic_read(&p->rt_param.klmirqd_sem_stat) == HELD) |
407 | up_and_set_stat(p, NOT_HELD, &p->rt_param.klitirqd_sem); | 407 | up_and_set_stat(p, NOT_HELD, &p->rt_param.klmirqd_sem); |
408 | #endif | 408 | #endif |
409 | 409 | ||
410 | #ifdef CONFIG_LITMUS_NVIDIA | 410 | #ifdef CONFIG_LITMUS_NVIDIA |
@@ -479,9 +479,9 @@ long __litmus_admit_task(struct task_struct* tsk) | |||
479 | #ifdef CONFIG_LITMUS_SOFTIRQD | 479 | #ifdef CONFIG_LITMUS_SOFTIRQD |
480 | /* proxy thread off by default */ | 480 | /* proxy thread off by default */ |
481 | tsk_rt(tsk)is_proxy_thread = 0; | 481 | tsk_rt(tsk)is_proxy_thread = 0; |
482 | tsk_rt(tsk)cur_klitirqd = NULL; | 482 | tsk_rt(tsk)cur_klmirqd = NULL; |
483 | mutex_init(&tsk_rt(tsk)->klitirqd_sem); | 483 | mutex_init(&tsk_rt(tsk)->klmirqd_sem); |
484 | atomic_set(&tsk_rt(tsk)->klitirqd_sem_stat, NOT_HELD); | 484 | atomic_set(&tsk_rt(tsk)->klmirqd_sem_stat, NOT_HELD); |
485 | #endif | 485 | #endif |
486 | 486 | ||
487 | retval = litmus->admit_task(tsk); | 487 | retval = litmus->admit_task(tsk); |
@@ -580,9 +580,9 @@ int switch_sched_plugin(struct sched_plugin* plugin) | |||
580 | cpu_relax(); | 580 | cpu_relax(); |
581 | 581 | ||
582 | #ifdef CONFIG_LITMUS_SOFTIRQD | 582 | #ifdef CONFIG_LITMUS_SOFTIRQD |
583 | if(!klitirqd_is_dead()) | 583 | if(!klmirqd_is_dead()) |
584 | { | 584 | { |
585 | kill_klitirqd(); | 585 | kill_klmirqd(); |
586 | } | 586 | } |
587 | #endif | 587 | #endif |
588 | 588 | ||