aboutsummaryrefslogtreecommitdiffstats
path: root/litmus
diff options
context:
space:
mode:
authorBjoern B. Brandenburg <bbb@cs.unc.edu>2010-11-11 02:54:40 -0500
committerBjoern B. Brandenburg <bbb@cs.unc.edu>2010-11-11 18:00:31 -0500
commit5a0df8d4e9a5da47c804d89426f06e08aa44426f (patch)
tree8f08781e3a0d4fc3b6dab6de04c13b0678008109 /litmus
parent7c1446ddceb89ee1ddbe5d7a90cfd4cb2bc8ad37 (diff)
Remove LITMUS^RT TRACE_BUG_ON macro
Linux now has a macro of the same name, which causes namespace collisions. Since our version is only being used in two places that haven't triggered in several years, let's just remove it.
Diffstat (limited to 'litmus')
-rw-r--r--litmus/sched_cedf.c6
-rw-r--r--litmus/sched_gsn_edf.c5
2 files changed, 0 insertions, 11 deletions
diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index 615560f21d60..111e4fb1c62b 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -210,12 +210,6 @@ static noinline void unlink(struct task_struct* t)
210{ 210{
211 cpu_entry_t *entry; 211 cpu_entry_t *entry;
212 212
213 if (unlikely(!t)) {
214 TRACE_BUG_ON(!t);
215 return;
216 }
217
218
219 if (t->rt_param.linked_on != NO_CPU) { 213 if (t->rt_param.linked_on != NO_CPU) {
220 /* unlink */ 214 /* unlink */
221 entry = &per_cpu(cedf_cpu_entries, t->rt_param.linked_on); 215 entry = &per_cpu(cedf_cpu_entries, t->rt_param.linked_on);
diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index f0337cfd8631..e9c5e531b1ae 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -210,11 +210,6 @@ static noinline void unlink(struct task_struct* t)
210{ 210{
211 cpu_entry_t *entry; 211 cpu_entry_t *entry;
212 212
213 if (unlikely(!t)) {
214 TRACE_BUG_ON(!t);
215 return;
216 }
217
218 if (t->rt_param.linked_on != NO_CPU) { 213 if (t->rt_param.linked_on != NO_CPU) {
219 /* unlink */ 214 /* unlink */
220 entry = &per_cpu(gsnedf_cpu_entries, t->rt_param.linked_on); 215 entry = &per_cpu(gsnedf_cpu_entries, t->rt_param.linked_on);