Commit 9cc26a26 authored by Steven Rostedt's avatar Steven Rostedt
Browse files

tracing: use generic __stringify 



Impact: clean up

This removes the custom made STR(x) macros in the tracer and uses
the generic __stringify macro instead.

Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
parent 2939b046

kernel/trace/events.c

+1 −3
Original line number Diff line number Diff line
@@ -2,9 +2,7 @@ 
 * This is the place to register all trace points as events.

 */



/* someday this needs to go in a generic header */

#define __STR(x) #x

#define STR(x) __STR(x)

#include <linux/stringify.h>



#include <trace/trace_events.h>

kernel/trace/trace_events_stage_3.h

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static struct ftrace_event_call __used \ 
__attribute__((__aligned__(4)))						\

__attribute__((section("_ftrace_events"))) event_##call = {		\

	.name 			= #call,				\

	.system			= STR(TRACE_SYSTEM),			\

	.system			= __stringify(TRACE_SYSTEM),		\

	.regfunc		= ftrace_reg_event_##call,		\

	.unregfunc		= ftrace_unreg_event_##call,		\

}
@@ -225,7 +225,7 @@ static struct ftrace_event_call __used \ 
__attribute__((__aligned__(4)))						\

__attribute__((section("_ftrace_events"))) event_##call = {		\

	.name 			= #call,				\

	.system			= STR(TRACE_SYSTEM),			\

	.system			= __stringify(TRACE_SYSTEM),		\

	.regfunc		= ftrace_reg_event_##call,		\

	.unregfunc		= ftrace_unreg_event_##call,		\

	.raw_init		= ftrace_raw_init_event_##call,		\

kernel/trace/trace_selftest.c

+2 −4
Original line number Diff line number Diff line 
/* Include in trace.c */



#include <linux/stringify.h>

#include <linux/kthread.h>

#include <linux/delay.h>
@@ -100,9 +101,6 @@ static inline void warn_failed_init_tracer(struct tracer *trace, int init_ret) 


#ifdef CONFIG_DYNAMIC_FTRACE



#define __STR(x) #x

#define STR(x) __STR(x)



/* Test dynamic code modification and ftrace filters */

int trace_selftest_startup_dynamic_tracing(struct tracer *trace,

					   struct trace_array *tr,
@@ -130,7 +128,7 @@ int trace_selftest_startup_dynamic_tracing(struct tracer *trace, 
	 * start of the function names. We simply put a '*' to

	 * accommodate them.

	 */

	func_name = "*" STR(DYN_FTRACE_TEST_NAME);

	func_name = "*" __stringify(DYN_FTRACE_TEST_NAME);



	/* filter only on our function */

	ftrace_set_filter(func_name, strlen(func_name), 1);