aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Brandenburg <bbb@mpi-sws.org>2013-07-21 07:51:38 -0400
committerBjoern Brandenburg <bbb@mpi-sws.org>2013-08-07 03:46:51 -0400
commit8f88280b7201efb67751b904728d7c8ed9786f93 (patch)
treecf1b8362f617dfa165f9ca69d5383006dfd860cd
parentd79d6ccb99ae635fbabd1d5879abe681ffc100b7 (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.c5
-rw-r--r--litmus/sched_task_trace.c5
2 files changed, 5 insertions, 5 deletions
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 7417a8fbda74..10e45b7bbecc 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -23,6 +23,11 @@
23#include <litmus/affinity.h> 23#include <litmus/affinity.h>
24#endif 24#endif
25 25
26#ifdef CONFIG_SCHED_LITMUS_TRACEPOINT
27#define CREATE_TRACE_POINTS
28#include <trace/events/litmus.h>
29#endif
30
26/* Number of RT tasks that exist in the system */ 31/* Number of RT tasks that exist in the system */
27atomic_t rt_task_count = ATOMIC_INIT(0); 32atomic_t rt_task_count = ATOMIC_INIT(0);
28 33
diff --git a/litmus/sched_task_trace.c b/litmus/sched_task_trace.c
index 2bdfbbddedb2..933e7e4c7094 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()