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.

3 files changed, 0 insertions, 23 deletions

diff --git a/include/litmus/debug_trace.h b/include/litmus/debug_trace.h
index 0f99be01d569..b743aa96de79 100644
--- a/include/litmus/debug_trace.h
+++ b/include/litmus/debug_trace.h
@@ -22,16 +22,4 @@ extern atomic_t __log_seq_no;
 #define TRACE_CUR(fmt, args...) \
         TRACE_TASK(current, fmt, ## args)
 
-#define TRACE_BUG_ON(cond) \
-        do { if (cond) TRACE("BUG_ON(%s) at %s:%d " \
-                             "called from %p current=%s/%d state=%d " \
-                             "flags=%x partition=%d cpu=%d rtflags=%d"\
-                             " job=%u timeslice=%u\n",          \
-        #cond, __FILE__, __LINE__, __builtin_return_address(0), current->comm, \
-        current->pid, current->state, current->flags,  \
-        get_partition(current), smp_processor_id(), get_rt_flags(current), \
-        current->rt_param.job_params.job_no, \
-        current->rt.time_slice\
-        ); } while(0);
-
 #endif
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)
 {
         cpu_entry_t *entry;
 
-        if (unlikely(!t)) {
-                TRACE_BUG_ON(!t);
-                return;
-        }
-
-
         if (t->rt_param.linked_on != NO_CPU) {
                 /* unlink */
                 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)
 {
         cpu_entry_t *entry;
 
-        if (unlikely(!t)) {
-                TRACE_BUG_ON(!t);
-                return;
-        }
-
         if (t->rt_param.linked_on != NO_CPU) {
                 /* unlink */
                 entry = &per_cpu(gsnedf_cpu_entries, t->rt_param.linked_on);