diff options
-rw-r--r-- | include/linux/tracepoint.h | 4 | ||||
-rw-r--r-- | include/trace/ftrace.h | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h index a4a90b6726ce..5a6074fcd81d 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h | |||
@@ -234,6 +234,8 @@ do_trace: \ | |||
234 | PARAMS(void *__data, proto), \ | 234 | PARAMS(void *__data, proto), \ |
235 | PARAMS(__data, args)) | 235 | PARAMS(__data, args)) |
236 | 236 | ||
237 | #define TRACE_EVENT_FLAGS(event, flag) | ||
238 | |||
237 | #endif /* DECLARE_TRACE */ | 239 | #endif /* DECLARE_TRACE */ |
238 | 240 | ||
239 | #ifndef TRACE_EVENT | 241 | #ifndef TRACE_EVENT |
@@ -354,4 +356,6 @@ do_trace: \ | |||
354 | assign, print, reg, unreg) \ | 356 | assign, print, reg, unreg) \ |
355 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) | 357 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) |
356 | 358 | ||
359 | #define TRACE_EVENT_FLAGS(event, flag) | ||
360 | |||
357 | #endif /* ifdef TRACE_EVENT (see note above) */ | 361 | #endif /* ifdef TRACE_EVENT (see note above) */ |
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index a9377c0083ad..6f540123d43e 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h | |||
@@ -82,6 +82,15 @@ | |||
82 | TRACE_EVENT(name, PARAMS(proto), PARAMS(args), \ | 82 | TRACE_EVENT(name, PARAMS(proto), PARAMS(args), \ |
83 | PARAMS(tstruct), PARAMS(assign), PARAMS(print)) \ | 83 | PARAMS(tstruct), PARAMS(assign), PARAMS(print)) \ |
84 | 84 | ||
85 | #undef TRACE_EVENT_FLAGS | ||
86 | #define TRACE_EVENT_FLAGS(name, value) \ | ||
87 | static int __init trace_init_flags_##name(void) \ | ||
88 | { \ | ||
89 | event_##name.flags = value; \ | ||
90 | return 0; \ | ||
91 | } \ | ||
92 | early_initcall(trace_init_flags_##name); | ||
93 | |||
85 | #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) | 94 | #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) |
86 | 95 | ||
87 | 96 | ||
@@ -129,6 +138,9 @@ | |||
129 | #define DEFINE_EVENT_PRINT(template, name, proto, args, print) \ | 138 | #define DEFINE_EVENT_PRINT(template, name, proto, args, print) \ |
130 | DEFINE_EVENT(template, name, PARAMS(proto), PARAMS(args)) | 139 | DEFINE_EVENT(template, name, PARAMS(proto), PARAMS(args)) |
131 | 140 | ||
141 | #undef TRACE_EVENT_FLAGS | ||
142 | #define TRACE_EVENT_FLAGS(event, flag) | ||
143 | |||
132 | #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) | 144 | #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) |
133 | 145 | ||
134 | /* | 146 | /* |