diff options
| -rw-r--r-- | include/litmus/debug_trace.h | 12 | ||||
| -rw-r--r-- | litmus/sched_cedf.c | 6 | ||||
| -rw-r--r-- | litmus/sched_gsn_edf.c | 5 |
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; | |||
| 22 | #define TRACE_CUR(fmt, args...) \ | 22 | #define TRACE_CUR(fmt, args...) \ |
| 23 | TRACE_TASK(current, fmt, ## args) | 23 | TRACE_TASK(current, fmt, ## args) |
| 24 | 24 | ||
| 25 | #define TRACE_BUG_ON(cond) \ | ||
| 26 | do { if (cond) TRACE("BUG_ON(%s) at %s:%d " \ | ||
| 27 | "called from %p current=%s/%d state=%d " \ | ||
| 28 | "flags=%x partition=%d cpu=%d rtflags=%d"\ | ||
| 29 | " job=%u timeslice=%u\n", \ | ||
| 30 | #cond, __FILE__, __LINE__, __builtin_return_address(0), current->comm, \ | ||
| 31 | current->pid, current->state, current->flags, \ | ||
| 32 | get_partition(current), smp_processor_id(), get_rt_flags(current), \ | ||
| 33 | current->rt_param.job_params.job_no, \ | ||
| 34 | current->rt.time_slice\ | ||
| 35 | ); } while(0); | ||
| 36 | |||
| 37 | #endif | 25 | #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) | |||
| 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); |
