aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Brandenburg <bbb@mpi-sws.org>2013-07-21 07:51:38 -0400
committerNamhoon Kim <namhoonk@cs.unc.edu>2014-10-21 10:02:44 -0400
commita1b5e6c8f816c6c28dfbce7e16d3977f96e380f2 (patch)
treef488f2cca8f7a610e4d3b847c5eed4a4ca266f1b
parent0072c939b32ecc73a15dc2cc28185f4324d28536 (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 9c419cdbab90..a061343ab769 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -25,6 +25,11 @@
25#include <litmus/affinity.h> 25#include <litmus/affinity.h>
26#endif 26#endif
27 27
28#ifdef CONFIG_SCHED_LITMUS_TRACEPOINT
29#define CREATE_TRACE_POINTS
30#include <trace/events/litmus.h>
31#endif
32
28/* Number of RT tasks that exist in the system */ 33/* Number of RT tasks that exist in the system */
29atomic_t rt_task_count = ATOMIC_INIT(0); 34atomic_t rt_task_count = ATOMIC_INIT(0);
30 35
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()