From 5a0df8d4e9a5da47c804d89426f06e08aa44426f Mon Sep 17 00:00:00 2001 From: "Bjoern B. Brandenburg" Date: Thu, 11 Nov 2010 02:54:40 -0500 Subject: 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. --- litmus/sched_cedf.c | 6 ------ litmus/sched_gsn_edf.c | 5 ----- 2 files changed, 11 deletions(-) (limited to 'litmus') 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); -- cgit v1.2.2