Split out TRACE() from litmus.h and cleanup some includes

The TRACE() functionality doesn't need all of litmus.h. Currently,
it's impossible to use TRACE() in sched.h due to a circular
dependency. This patch moves TRACE() and friends to
litmus/sched_debug.h, which can be included in sched.h.

While at it, also fix some minor include ugliness that was revealed by
this change.

1 files changed, 1 insertions, 27 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 5d20276e44f4..30f41869b455 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -6,38 +6,12 @@
 #ifndef _LINUX_LITMUS_H_
 #define _LINUX_LITMUS_H_
 
-#include <linux/jiffies.h>
-#include <litmus/sched_trace.h>
+#include <litmus/debug_trace.h>
 
 #ifdef CONFIG_RELEASE_MASTER
 extern atomic_t release_master_cpu;
 #endif
 
-extern atomic_t __log_seq_no;
-
-#define TRACE(fmt, args...) \
-        sched_trace_log_message("%d P%d: " fmt, atomic_add_return(1, &__log_seq_no), \
-                                raw_smp_processor_id(), ## args)
-
-#define TRACE_TASK(t, fmt, args...) \
-        TRACE("(%s/%d) " fmt, (t)->comm, (t)->pid, ##args)
-
-#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);
-
-
 /* in_list - is a given list_head queued on some list?
  */
 static inline int in_list(struct list_head* list)