aboutsummaryrefslogtreecommitdiffstats
path: root/litmus/sched_cedf.c
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2013-01-18 11:13:07 -0500
committerGlenn Elliott <gelliott@cs.unc.edu>2013-01-18 11:14:15 -0500
commitcc9f46d0ce73ae30e3918999976ef587b0e8a04d (patch)
tree85c3da741b968ce8ad0f3b75daa86238cd93a054 /litmus/sched_cedf.c
parente6b58b65441925c307f40ce5bd9d5676750f7601 (diff)
/proc hooks for locking protocols.
RSM locks only make use of /proc for now.
Diffstat (limited to 'litmus/sched_cedf.c')
-rw-r--r--litmus/sched_cedf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index db47f4413329..2ec919dc850c 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -1068,7 +1068,7 @@ static void cedf_task_block(struct task_struct *t)
1068#ifdef CONFIG_LITMUS_NVIDIA 1068#ifdef CONFIG_LITMUS_NVIDIA
1069 if (tsk_rt(t)->held_gpus && !tsk_rt(t)->hide_from_gpu) { 1069 if (tsk_rt(t)->held_gpus && !tsk_rt(t)->hide_from_gpu) {
1070 1070
1071 TRACE_CUR("%s/%d is blocked so aux tasks may inherit.\n", t->comm, t->pid); 1071 TRACE_CUR("%s/%d is blocked so klmirqd threads may inherit.\n", t->comm, t->pid);
1072 enable_gpu_owner(t); 1072 enable_gpu_owner(t);
1073 } 1073 }
1074#endif 1074#endif
@@ -1118,7 +1118,7 @@ static void cedf_task_exit(struct task_struct * t)
1118 raw_spin_unlock_irqrestore(&cluster->cluster_lock, flags); 1118 raw_spin_unlock_irqrestore(&cluster->cluster_lock, flags);
1119 1119
1120 BUG_ON(!is_realtime(t)); 1120 BUG_ON(!is_realtime(t));
1121 TRACE_TASK(t, "RIP\n"); 1121 TRACE_TASK(t, "RIP\n");
1122} 1122}
1123 1123
1124static long cedf_admit_task(struct task_struct* tsk) 1124static long cedf_admit_task(struct task_struct* tsk)
@@ -1128,7 +1128,7 @@ static long cedf_admit_task(struct task_struct* tsk)
1128 edf_max_heap_base_priority_order); 1128 edf_max_heap_base_priority_order);
1129#endif 1129#endif
1130 1130
1131 return task_cpu(tsk) == tsk->rt_param.task_params.cpu ? 0 : -EINVAL; 1131 return (task_cpu(tsk) == tsk->rt_param.task_params.cpu) ? 0 : -EINVAL;
1132} 1132}
1133 1133
1134 1134