diff options
author | Bjoern Brandenburg <bbb@mpi-sws.org> | 2015-08-09 07:18:49 -0400 |
---|---|---|
committer | Bjoern Brandenburg <bbb@mpi-sws.org> | 2015-08-09 06:21:19 -0400 |
commit | f6f66a8fc952bbb49e9a6899fd119c46aa8b15bc (patch) | |
tree | a227f85b31c8f1a62dbfab31a7784ca400bc46ac | |
parent | c8e818a62bc06b4df53c1662fbb21b650ab2f659 (diff) |
Move trace point definition to litmus/litmus.c
If !CONFIG_SCHED_TASK_TRACE, but CONFIG_SCHED_LITMUS_TRACEPOINT, then
we still need to define the tracepoint structures.
This patch should be integrated with the earlier sched_task_trace.c
patches during one of the next major rebasing efforts.
-rw-r--r-- | litmus/litmus.c | 5 | ||||
-rw-r--r-- | litmus/sched_task_trace.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/litmus/litmus.c b/litmus/litmus.c index 703360c68609..db5ce0e9c76e 100644 --- a/litmus/litmus.c +++ b/litmus/litmus.c | |||
@@ -26,6 +26,11 @@ | |||
26 | #include <litmus/affinity.h> | 26 | #include <litmus/affinity.h> |
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | #ifdef CONFIG_SCHED_LITMUS_TRACEPOINT | ||
30 | #define CREATE_TRACE_POINTS | ||
31 | #include <trace/events/litmus.h> | ||
32 | #endif | ||
33 | |||
29 | /* Number of RT tasks that exist in the system */ | 34 | /* Number of RT tasks that exist in the system */ |
30 | atomic_t rt_task_count = ATOMIC_INIT(0); | 35 | atomic_t rt_task_count = ATOMIC_INIT(0); |
31 | 36 | ||
diff --git a/litmus/sched_task_trace.c b/litmus/sched_task_trace.c index fb4eddf1d7bc..c154ec48be41 100644 --- a/litmus/sched_task_trace.c +++ b/litmus/sched_task_trace.c | |||
@@ -15,11 +15,6 @@ | |||
15 | #include <litmus/feather_trace.h> | 15 | #include <litmus/feather_trace.h> |
16 | #include <litmus/ftdev.h> | 16 | #include <litmus/ftdev.h> |
17 | 17 | ||
18 | #ifdef CONFIG_SCHED_LITMUS_TRACEPOINT | ||
19 | #define CREATE_TRACE_POINTS | ||
20 | #include <trace/events/litmus.h> | ||
21 | #endif | ||
22 | |||
23 | #define NO_EVENTS (1 << CONFIG_SCHED_TASK_TRACE_SHIFT) | 18 | #define NO_EVENTS (1 << CONFIG_SCHED_TASK_TRACE_SHIFT) |
24 | 19 | ||
25 | #define now() litmus_clock() | 20 | #define now() litmus_clock() |