diff options
author | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2010-11-08 15:02:09 -0500 |
---|---|---|
committer | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2010-11-11 17:57:42 -0500 |
commit | 34310fd7dbc3ad98d8e7cafa4f872ba71ca00860 (patch) | |
tree | 31ddcaa124430c37ccb5e2f4cb0a69c37ad885ba /litmus/litmus.c | |
parent | c6182ba4a548baf0d1238d0df54e7d38ed299c3e (diff) |
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.
Diffstat (limited to 'litmus/litmus.c')
-rw-r--r-- | litmus/litmus.c | 8 |
1 files changed, 2 insertions, 6 deletions
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 @@ | |||
6 | #include <asm/uaccess.h> | 6 | #include <asm/uaccess.h> |
7 | #include <linux/uaccess.h> | 7 | #include <linux/uaccess.h> |
8 | #include <linux/sysrq.h> | 8 | #include <linux/sysrq.h> |
9 | 9 | #include <linux/sched.h> | |
10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
11 | #include <linux/slab.h> | 11 | #include <linux/slab.h> |
12 | 12 | ||
13 | #include <litmus/litmus.h> | 13 | #include <litmus/litmus.h> |
14 | #include <linux/sched.h> | ||
15 | |||
16 | #include <litmus/bheap.h> | 14 | #include <litmus/bheap.h> |
17 | |||
18 | #include <litmus/trace.h> | 15 | #include <litmus/trace.h> |
19 | |||
20 | #include <litmus/rt_domain.h> | 16 | #include <litmus/rt_domain.h> |
21 | |||
22 | #include <litmus/litmus_proc.h> | 17 | #include <litmus/litmus_proc.h> |
18 | #include <litmus/sched_trace.h> | ||
23 | 19 | ||
24 | /* Number of RT tasks that exist in the system */ | 20 | /* Number of RT tasks that exist in the system */ |
25 | atomic_t rt_task_count = ATOMIC_INIT(0); | 21 | atomic_t rt_task_count = ATOMIC_INIT(0); |