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.

7 files changed, 9 insertions, 10 deletions

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>