aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_export.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace/trace_export.c')
-rw-r--r--kernel/trace/trace_export.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel/trace/trace_export.c b/kernel/trace/trace_export.c
index 9cbe7f1930e..f75faeccf68 100644
--- a/kernel/trace/trace_export.c
+++ b/kernel/trace/trace_export.c
@@ -42,9 +42,9 @@ extern void __bad_type_size(void);
42 if (!ret) \ 42 if (!ret) \
43 return 0; 43 return 0;
44 44
45#undef TRACE_FIELD_ZERO_CHAR 45#undef TRACE_FIELD_ZERO
46#define TRACE_FIELD_ZERO_CHAR(item) \ 46#define TRACE_FIELD_ZERO(type, item) \
47 ret = trace_seq_printf(s, "\tfield:char " #item ";\t" \ 47 ret = trace_seq_printf(s, "\tfield:" #type " " #item ";\t" \
48 "offset:%u;\tsize:0;\n", \ 48 "offset:%u;\tsize:0;\n", \
49 (unsigned int)offsetof(typeof(field), item)); \ 49 (unsigned int)offsetof(typeof(field), item)); \
50 if (!ret) \ 50 if (!ret) \
@@ -92,9 +92,6 @@ ftrace_format_##call(struct ftrace_event_call *unused, \
92 92
93#include "trace_event_types.h" 93#include "trace_event_types.h"
94 94
95#undef TRACE_ZERO_CHAR
96#define TRACE_ZERO_CHAR(arg)
97
98#undef TRACE_FIELD 95#undef TRACE_FIELD
99#define TRACE_FIELD(type, item, assign)\ 96#define TRACE_FIELD(type, item, assign)\
100 entry->item = assign; 97 entry->item = assign;
@@ -107,6 +104,9 @@ ftrace_format_##call(struct ftrace_event_call *unused, \
107#define TRACE_FIELD_SIGN(type, item, assign, is_signed) \ 104#define TRACE_FIELD_SIGN(type, item, assign, is_signed) \
108 TRACE_FIELD(type, item, assign) 105 TRACE_FIELD(type, item, assign)
109 106
107#undef TRACE_FIELD_ZERO
108#define TRACE_FIELD_ZERO(type, item)
109
110#undef TP_CMD 110#undef TP_CMD
111#define TP_CMD(cmd...) cmd 111#define TP_CMD(cmd...) cmd
112 112
@@ -180,8 +180,8 @@ __attribute__((section("_ftrace_events"))) event_##call = { \
180 if (ret) \ 180 if (ret) \
181 return ret; 181 return ret;
182 182
183#undef TRACE_FIELD_ZERO_CHAR 183#undef TRACE_FIELD_ZERO
184#define TRACE_FIELD_ZERO_CHAR(item) 184#define TRACE_FIELD_ZERO(type, item)
185 185
186#undef TRACE_EVENT_FORMAT 186#undef TRACE_EVENT_FORMAT
187#define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt) \ 187#define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt) \