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.

10 files changed, 47 insertions, 46 deletions

diff --git a/include/litmus/debug_trace.h b/include/litmus/debug_trace.h
new file mode 100644
index 000000000000..0f99be01d569
--- /dev/null
+++ b/include/litmus/debug_trace.h
@@ -0,0 +1,37 @@
+#ifndef LITMUS_DEBUG_TRACE_H
+#define LITMUS_DEBUG_TRACE_H
+
+#ifdef CONFIG_SCHED_DEBUG_TRACE
+void sched_trace_log_message(const char* fmt, ...);
+void dump_trace_buffer(int max);
+#else
+
+#define sched_trace_log_message(fmt, ...)
+
+#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);
+
+#endif
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)
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index e1b0c9712b5f..a5f73736f7e8 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -178,15 +178,6 @@ feather_callback void do_sched_trace_sys_release(unsigned long id,
 
 #define sched_trace_quantum_boundary() /* NOT IMPLEMENTED */
 
-#ifdef CONFIG_SCHED_DEBUG_TRACE
-void sched_trace_log_message(const char* fmt, ...);
-void dump_trace_buffer(int max);
-#else
-
-#define sched_trace_log_message(fmt, ...)
-
-#endif
-
 #endif /* __KERNEL__ */
 
 #endif
diff --git a/litmus/budget.c b/litmus/budget.c
index b99177a26313..f6f5ca81c9d6 100644
--- a/litmus/budget.c
+++ b/litmus/budget.c
@@ -1,3 +1,4 @@
+#include <linux/sched.h>
 #include <linux/percpu.h>
 #include <linux/hrtimer.h>
 
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 99c35ac99870..0756d0156f8f 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -6,20 +6,16 @@
 #include <asm/uaccess.h>
 #include <linux/uaccess.h>
 #include <linux/sysrq.h>
-
+#include <linux/sched.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 
 #include <litmus/litmus.h>
-#include <linux/sched.h>
-
 #include <litmus/bheap.h>
-
 #include <litmus/trace.h>
-
 #include <litmus/rt_domain.h>
-
 #include <litmus/litmus_proc.h>
+#include <litmus/sched_trace.h>
 
 /* Number of RT tasks that exist in the system */
 atomic_t rt_task_count          = ATOMIC_INIT(0);
diff --git a/litmus/litmus_proc.c b/litmus/litmus_proc.c
index c10a6a6d3975..81ea5c35d291 100644
--- a/litmus/litmus_proc.c
+++ b/litmus/litmus_proc.c
@@ -2,6 +2,7 @@
  * litmus_proc.c -- Implementation of the /proc/litmus directory tree.
  */
 
+#include <linux/sched.h>
 #include <linux/uaccess.h>
 
 #include <litmus/litmus.h>
diff --git a/litmus/sched_plugin.c b/litmus/sched_plugin.c
index d706a08fb313..ec04454a0cf9 100644
--- a/litmus/sched_plugin.c
+++ b/litmus/sched_plugin.c
@@ -6,6 +6,7 @@
 
 #include <linux/list.h>
 #include <linux/spinlock.h>
+#include <linux/sched.h>
 
 #include <litmus/litmus.h>
 #include <litmus/sched_plugin.h>
diff --git a/litmus/sched_psn_edf.c b/litmus/sched_psn_edf.c
index 73f64730bd5e..aa567f2b91b9 100644
--- a/litmus/sched_psn_edf.c
+++ b/litmus/sched_psn_edf.c
@@ -12,14 +12,13 @@
 #include <linux/sched.h>
 #include <linux/list.h>
 #include <linux/spinlock.h>
-
 #include <linux/module.h>
 
 #include <litmus/litmus.h>
 #include <litmus/jobs.h>
 #include <litmus/sched_plugin.h>
 #include <litmus/edf_common.h>
-
+#include <litmus/sched_trace.h>
 
 typedef struct {
         rt_domain_t             domain;
diff --git a/litmus/srp.c b/litmus/srp.c
index 71639b991630..cb577598ce3e 100644
--- a/litmus/srp.c
+++ b/litmus/srp.c
@@ -3,12 +3,12 @@
 /* ************************************************************************** */
 
 #include <asm/atomic.h>
+#include <linux/sched.h>
 #include <linux/wait.h>
+
 #include <litmus/litmus.h>
 #include <litmus/sched_plugin.h>
-
 #include <litmus/fdso.h>
-
 #include <litmus/trace.h>
 
 
diff --git a/litmus/trace.c b/litmus/trace.c
index 440376998dc9..b3a6b47aad6e 100644
--- a/litmus/trace.c
+++ b/litmus/trace.c
@@ -1,3 +1,4 @@
+#include <linux/sched.h>
 #include <linux/module.h>
 
 #include <litmus/ftdev.h>