aboutsummaryrefslogtreecommitdiffstats
path: root/litmus/edf_common.c
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2012-03-22 14:45:39 -0400
committerGlenn Elliott <gelliott@cs.unc.edu>2012-03-22 14:45:39 -0400
commit8973214f010cf55fbf18cb88471d6c99ed6ff575 (patch)
tree80fe28857305bb6cfaaa130206967282759511e7 /litmus/edf_common.c
parent6a00f206debf8a5c8899055726ad127dbeeed098 (diff)
Introduction of basic nesting foundations.
Diffstat (limited to 'litmus/edf_common.c')
-rw-r--r--litmus/edf_common.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/litmus/edf_common.c b/litmus/edf_common.c
index 9b44dc2d8d1e..54cfada586be 100644
--- a/litmus/edf_common.c
+++ b/litmus/edf_common.c
@@ -42,10 +42,10 @@ int edf_higher_prio(struct task_struct* first,
42 /* Check for inherited priorities. Change task 42 /* Check for inherited priorities. Change task
43 * used for comparison in such a case. 43 * used for comparison in such a case.
44 */ 44 */
45 if (unlikely(first->rt_param.inh_task)) 45 if (unlikely(first->rt_param.eff_prio))
46 first_task = first->rt_param.inh_task; 46 first_task = first->rt_param.eff_prio;
47 if (unlikely(second->rt_param.inh_task)) 47 if (unlikely(second->rt_param.eff_prio))
48 second_task = second->rt_param.inh_task; 48 second_task = second->rt_param.eff_prio;
49 49
50 /* Check for priority boosting. Tie-break by start of boosting. 50 /* Check for priority boosting. Tie-break by start of boosting.
51 */ 51 */
@@ -81,7 +81,7 @@ int edf_higher_prio(struct task_struct* first,
81 * priority wins. 81 * priority wins.
82 */ 82 */
83 (first_task->pid == second_task->pid && 83 (first_task->pid == second_task->pid &&
84 !second->rt_param.inh_task))); 84 !second->rt_param.eff_prio)));
85} 85}
86 86
87int edf_ready_order(struct bheap_node* a, struct bheap_node* b) 87int edf_ready_order(struct bheap_node* a, struct bheap_node* b)