aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/tracepoint.h2
-rw-r--r--include/trace/sched_event_types.h26
-rw-r--r--kernel/trace/trace_events.h4
3 files changed, 16 insertions, 16 deletions
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index 34ae464effff..3de09fa8e01d 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -153,7 +153,7 @@ static inline void tracepoint_synchronize_unregister(void)
153 synchronize_sched(); 153 synchronize_sched();
154} 154}
155 155
156#define DEFINE_TRACE_FMT(name, proto, args, fmt) \ 156#define TRACE_FORMAT(name, proto, args, fmt) \
157 DECLARE_TRACE(name, TPPROTO(proto), TPARGS(args)) 157 DECLARE_TRACE(name, TPPROTO(proto), TPARGS(args))
158 158
159#endif 159#endif
diff --git a/include/trace/sched_event_types.h b/include/trace/sched_event_types.h
index a4f662940f4e..a3d3d66a51c8 100644
--- a/include/trace/sched_event_types.h
+++ b/include/trace/sched_event_types.h
@@ -1,72 +1,72 @@
1 1
2/* use <trace/sched.h> instead */ 2/* use <trace/sched.h> instead */
3#ifndef DEFINE_TRACE_FMT 3#ifndef TRACE_FORMAT
4# error Do not include this file directly. 4# error Do not include this file directly.
5# error Unless you know what you are doing. 5# error Unless you know what you are doing.
6#endif 6#endif
7 7
8DEFINE_TRACE_FMT(sched_kthread_stop, 8TRACE_FORMAT(sched_kthread_stop,
9 TPPROTO(struct task_struct *t), 9 TPPROTO(struct task_struct *t),
10 TPARGS(t), 10 TPARGS(t),
11 TPFMT("task %s:%d", t->comm, t->pid)); 11 TPFMT("task %s:%d", t->comm, t->pid));
12 12
13DEFINE_TRACE_FMT(sched_kthread_stop_ret, 13TRACE_FORMAT(sched_kthread_stop_ret,
14 TPPROTO(int ret), 14 TPPROTO(int ret),
15 TPARGS(ret), 15 TPARGS(ret),
16 TPFMT("ret=%d", ret)); 16 TPFMT("ret=%d", ret));
17 17
18DEFINE_TRACE_FMT(sched_wait_task, 18TRACE_FORMAT(sched_wait_task,
19 TPPROTO(struct rq *rq, struct task_struct *p), 19 TPPROTO(struct rq *rq, struct task_struct *p),
20 TPARGS(rq, p), 20 TPARGS(rq, p),
21 TPFMT("task %s:%d", p->comm, p->pid)); 21 TPFMT("task %s:%d", p->comm, p->pid));
22 22
23DEFINE_TRACE_FMT(sched_wakeup, 23TRACE_FORMAT(sched_wakeup,
24 TPPROTO(struct rq *rq, struct task_struct *p, int success), 24 TPPROTO(struct rq *rq, struct task_struct *p, int success),
25 TPARGS(rq, p, success), 25 TPARGS(rq, p, success),
26 TPFMT("task %s:%d %s", 26 TPFMT("task %s:%d %s",
27 p->comm, p->pid, success?"succeeded":"failed")); 27 p->comm, p->pid, success?"succeeded":"failed"));
28 28
29DEFINE_TRACE_FMT(sched_wakeup_new, 29TRACE_FORMAT(sched_wakeup_new,
30 TPPROTO(struct rq *rq, struct task_struct *p, int success), 30 TPPROTO(struct rq *rq, struct task_struct *p, int success),
31 TPARGS(rq, p, success), 31 TPARGS(rq, p, success),
32 TPFMT("task %s:%d", 32 TPFMT("task %s:%d",
33 p->comm, p->pid, success?"succeeded":"failed")); 33 p->comm, p->pid, success?"succeeded":"failed"));
34 34
35DEFINE_TRACE_FMT(sched_switch, 35TRACE_FORMAT(sched_switch,
36 TPPROTO(struct rq *rq, struct task_struct *prev, 36 TPPROTO(struct rq *rq, struct task_struct *prev,
37 struct task_struct *next), 37 struct task_struct *next),
38 TPARGS(rq, prev, next), 38 TPARGS(rq, prev, next),
39 TPFMT("task %s:%d ==> %s:%d", 39 TPFMT("task %s:%d ==> %s:%d",
40 prev->comm, prev->pid, next->comm, next->pid)); 40 prev->comm, prev->pid, next->comm, next->pid));
41 41
42DEFINE_TRACE_FMT(sched_migrate_task, 42TRACE_FORMAT(sched_migrate_task,
43 TPPROTO(struct task_struct *p, int orig_cpu, int dest_cpu), 43 TPPROTO(struct task_struct *p, int orig_cpu, int dest_cpu),
44 TPARGS(p, orig_cpu, dest_cpu), 44 TPARGS(p, orig_cpu, dest_cpu),
45 TPFMT("task %s:%d from: %d to: %d", 45 TPFMT("task %s:%d from: %d to: %d",
46 p->comm, p->pid, orig_cpu, dest_cpu)); 46 p->comm, p->pid, orig_cpu, dest_cpu));
47 47
48DEFINE_TRACE_FMT(sched_process_free, 48TRACE_FORMAT(sched_process_free,
49 TPPROTO(struct task_struct *p), 49 TPPROTO(struct task_struct *p),
50 TPARGS(p), 50 TPARGS(p),
51 TPFMT("task %s:%d", p->comm, p->pid)); 51 TPFMT("task %s:%d", p->comm, p->pid));
52 52
53DEFINE_TRACE_FMT(sched_process_exit, 53TRACE_FORMAT(sched_process_exit,
54 TPPROTO(struct task_struct *p), 54 TPPROTO(struct task_struct *p),
55 TPARGS(p), 55 TPARGS(p),
56 TPFMT("task %s:%d", p->comm, p->pid)); 56 TPFMT("task %s:%d", p->comm, p->pid));
57 57
58DEFINE_TRACE_FMT(sched_process_wait, 58TRACE_FORMAT(sched_process_wait,
59 TPPROTO(struct pid *pid), 59 TPPROTO(struct pid *pid),
60 TPARGS(pid), 60 TPARGS(pid),
61 TPFMT("pid %d", pid)); 61 TPFMT("pid %d", pid));
62 62
63DEFINE_TRACE_FMT(sched_process_fork, 63TRACE_FORMAT(sched_process_fork,
64 TPPROTO(struct task_struct *parent, struct task_struct *child), 64 TPPROTO(struct task_struct *parent, struct task_struct *child),
65 TPARGS(parent, child), 65 TPARGS(parent, child),
66 TPFMT("parent %s:%d child %s:%d", 66 TPFMT("parent %s:%d child %s:%d",
67 parent->comm, parent->pid, child->comm, child->pid)); 67 parent->comm, parent->pid, child->comm, child->pid));
68 68
69DEFINE_TRACE_FMT(sched_signal_send, 69TRACE_FORMAT(sched_signal_send,
70 TPPROTO(int sig, struct task_struct *p), 70 TPPROTO(int sig, struct task_struct *p),
71 TPARGS(sig, p), 71 TPARGS(sig, p),
72 TPFMT("sig: %d task %s:%d", sig, p->comm, p->pid)); 72 TPFMT("sig: %d task %s:%d", sig, p->comm, p->pid));
diff --git a/kernel/trace/trace_events.h b/kernel/trace/trace_events.h
index cb8455b3ac9a..deb95e5006c8 100644
--- a/kernel/trace/trace_events.h
+++ b/kernel/trace/trace_events.h
@@ -17,8 +17,8 @@ struct ftrace_event_call {
17#undef TPFMT 17#undef TPFMT
18#define TPFMT(fmt, args...) fmt "\n", ##args 18#define TPFMT(fmt, args...) fmt "\n", ##args
19 19
20#undef DEFINE_TRACE_FMT 20#undef TRACE_FORMAT
21#define DEFINE_TRACE_FMT(call, proto, args, fmt) \ 21#define TRACE_FORMAT(call, proto, args, fmt) \
22static void ftrace_event_##call(proto) \ 22static void ftrace_event_##call(proto) \
23{ \ 23{ \
24 event_trace_printk(_RET_IP_, "(" #call ") " fmt); \ 24 event_trace_printk(_RET_IP_, "(" #call ") " fmt); \