diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2014-03-03 12:48:30 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2014-03-03 12:48:30 -0500 |
commit | a3b844a12fef92398834796ce69a41289ab60be6 (patch) | |
tree | 80c6e508356380e954609c9728678439d1d2ea2e | |
parent | 102006b99b30dcefc331821a901342f2a9f10b49 (diff) |
Fix compil. bug when nested locking is disabled
This patch fixes a compilation bug that occurs
when nested locking is disabled.
-rw-r--r-- | include/litmus/edf_common.h | 4 | ||||
-rw-r--r-- | litmus/locking.c | 20 |
2 files changed, 23 insertions, 1 deletions
diff --git a/include/litmus/edf_common.h b/include/litmus/edf_common.h index 84cec2099a23..e4b8b91e8d01 100644 --- a/include/litmus/edf_common.h +++ b/include/litmus/edf_common.h | |||
@@ -26,8 +26,10 @@ int edf_max_heap_base_priority_order(struct binheap_node *a, | |||
26 | struct binheap_node *b); | 26 | struct binheap_node *b); |
27 | int edf_min_heap_base_priority_order(struct binheap_node *a, | 27 | int edf_min_heap_base_priority_order(struct binheap_node *a, |
28 | struct binheap_node *b); | 28 | struct binheap_node *b); |
29 | int edf_preemption_needed(rt_domain_t* rt, struct task_struct *t); | ||
30 | #ifdef CONFIG_LITMUS_NESTED_LOCKING | ||
29 | int __edf_higher_prio(struct task_struct* first, comparison_mode_t first_mode, | 31 | int __edf_higher_prio(struct task_struct* first, comparison_mode_t first_mode, |
30 | struct task_struct* second, comparison_mode_t second_mode); | 32 | struct task_struct* second, comparison_mode_t second_mode); |
31 | int edf_preemption_needed(rt_domain_t* rt, struct task_struct *t); | 33 | #endif |
32 | 34 | ||
33 | #endif | 35 | #endif |
diff --git a/litmus/locking.c b/litmus/locking.c index 6302bd47304b..35140c26573d 100644 --- a/litmus/locking.c +++ b/litmus/locking.c | |||
@@ -1042,4 +1042,24 @@ asmlinkage long sys_litmus_unlock(int sem_od) | |||
1042 | return -ENOSYS; | 1042 | return -ENOSYS; |
1043 | } | 1043 | } |
1044 | 1044 | ||
1045 | asmlinkage long sys_litmus_should_yield_lock(int lock_od) | ||
1046 | { | ||
1047 | return -ENOSYS; | ||
1048 | } | ||
1049 | |||
1050 | asmlinkage long sys_litmus_dgl_lock(void* __user usr_dgl_ods, int dgl_size) | ||
1051 | { | ||
1052 | return -ENOSYS; | ||
1053 | } | ||
1054 | |||
1055 | asmlinkage long sys_litmus_dgl_unlock(void* __user usr_dgl_ods, int dgl_size) | ||
1056 | { | ||
1057 | return -ENOSYS; | ||
1058 | } | ||
1059 | |||
1060 | asmlinkage long sys_litmus_dgl_should_yield_lock(void* __user usr_dgl_ods, | ||
1061 | int dgl_size) | ||
1062 | { | ||
1063 | return -ENOSYS; | ||
1064 | } | ||
1045 | #endif /* end CONFIG_LITMUS_LOCKING */ | 1065 | #endif /* end CONFIG_LITMUS_LOCKING */ |