Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abb43f69 authored by Mathieu Desnoyers's avatar Mathieu Desnoyers Committed by Steven Rostedt
Browse files

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: default avatarMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent b725dfea

include/linux/syscalls.h

+6 −2
Original line number Diff line number Diff line
@@ -119,8 +119,10 @@ extern struct trace_event_functions exit_syscall_print_funcs; 
	static struct syscall_metadata __syscall_meta_##sname;		\

	static struct ftrace_event_call __used				\

	  event_enter_##sname = {					\

		.name                   = "sys_enter"#sname,		\

		.class			= &event_class_syscall_enter,	\

		{							\

			.name                   = "sys_enter"#sname,	\

		},							\

		.event.funcs            = &enter_syscall_print_funcs,	\

		.data			= (void *)&__syscall_meta_##sname,\

		.flags                  = TRACE_EVENT_FL_CAP_ANY,	\
@@ -133,8 +135,10 @@ extern struct trace_event_functions exit_syscall_print_funcs; 
	static struct syscall_metadata __syscall_meta_##sname;		\

	static struct ftrace_event_call __used				\

	  event_exit_##sname = {					\

		.name                   = "sys_exit"#sname,		\

		.class			= &event_class_syscall_exit,	\

		{							\

			.name                   = "sys_exit"#sname,	\

		},							\

		.event.funcs		= &exit_syscall_print_funcs,	\

		.data			= (void *)&__syscall_meta_##sname,\

		.flags                  = TRACE_EVENT_FL_CAP_ANY,	\

include/trace/ftrace.h

+9 −3
Original line number Diff line number Diff line
@@ -470,8 +470,10 @@ static inline notrace int ftrace_get_offsets_##call( \ 
 * };

 *

 * static struct ftrace_event_call event_<call> = {

 *	.tp			= &__tracepoint_<call>,

 *	.class			= event_class_<template>,

 *	{

 *		.tp			= &__tracepoint_<call>,

 *	},

 *	.event			= &ftrace_event_type_<call>,

 *	.print_fmt		= print_fmt_<call>,

 *	.flags			= TRACE_EVENT_FL_TRACEPOINT,
@@ -606,8 +608,10 @@ static struct ftrace_event_class __used __refdata event_class_##call = { \ 
#define DEFINE_EVENT(template, call, proto, args)			\

									\

static struct ftrace_event_call __used event_##call = {			\

	.tp			= &__tracepoint_##call,			\

	.class			= &event_class_##template,		\

	{								\

		.tp			= &__tracepoint_##call,		\

	},								\

	.event.funcs		= &ftrace_event_type_funcs_##template,	\

	.print_fmt		= print_fmt_##template,			\

	.flags			= TRACE_EVENT_FL_TRACEPOINT,		\
@@ -621,8 +625,10 @@ __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call 
static const char print_fmt_##call[] = print;				\

									\

static struct ftrace_event_call __used event_##call = {			\

	.tp			= &__tracepoint_##call,			\

	.class			= &event_class_##template,		\

	{								\

		.tp			= &__tracepoint_##call,		\

	},								\

	.event.funcs		= &ftrace_event_type_funcs_##call,	\

	.print_fmt		= print_fmt_##call,			\

	.flags			= TRACE_EVENT_FL_TRACEPOINT,		\

kernel/trace/trace_export.c

+4 −2
Original line number Diff line number Diff line
@@ -173,9 +173,11 @@ struct ftrace_event_class __refdata event_class_ftrace_##call = { \ 
};									\

									\

struct ftrace_event_call __used event_##call = {			\

	.class			= &event_class_ftrace_##call,		\

	{								\

		.name			= #call,			\

	},								\

	.event.type		= etype,				\

	.class			= &event_class_ftrace_##call,		\

	.print_fmt		= print,				\

	.flags			= TRACE_EVENT_FL_IGNORE_ENABLE | TRACE_EVENT_FL_USE_CALL_FILTER, \

};									\