diff options
author | Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | 2014-04-09 17:06:08 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2014-04-09 20:02:55 -0400 |
commit | abb43f6998eb6466ea392d3757e673bbdb6ae171 (patch) | |
tree | 068d361c31e1d9e7668c19dbe6324523eac718f9 /kernel/trace | |
parent | b725dfea24b89de672c055b34b22398283a3f4bc (diff) |
tracing: Fix anonymous unions in struct ftrace_event_call
gcc <= 4.5.x has significant limitations with respect to initialization
of anonymous unions within structures. They need to be surrounded by
brackets, _and_ they need to be initialized in the same order in which
they appear in the structure declaration.
Link: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=10676
Link: http://lkml.kernel.org/r/1397077568-3156-1-git-send-email-mathieu.desnoyers@efficios.com
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
-rw-r--r-- | kernel/trace/trace_export.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/trace/trace_export.c b/kernel/trace/trace_export.c index ee0a5098ac43..d4ddde28a81a 100644 --- a/kernel/trace/trace_export.c +++ b/kernel/trace/trace_export.c | |||
@@ -173,9 +173,11 @@ struct ftrace_event_class __refdata event_class_ftrace_##call = { \ | |||
173 | }; \ | 173 | }; \ |
174 | \ | 174 | \ |
175 | struct ftrace_event_call __used event_##call = { \ | 175 | struct ftrace_event_call __used event_##call = { \ |
176 | .name = #call, \ | ||
177 | .event.type = etype, \ | ||
178 | .class = &event_class_ftrace_##call, \ | 176 | .class = &event_class_ftrace_##call, \ |
177 | { \ | ||
178 | .name = #call, \ | ||
179 | }, \ | ||
180 | .event.type = etype, \ | ||
179 | .print_fmt = print, \ | 181 | .print_fmt = print, \ |
180 | .flags = TRACE_EVENT_FL_IGNORE_ENABLE | TRACE_EVENT_FL_USE_CALL_FILTER, \ | 182 | .flags = TRACE_EVENT_FL_IGNORE_ENABLE | TRACE_EVENT_FL_USE_CALL_FILTER, \ |
181 | }; \ | 183 | }; \ |