From 343fdcbdee08500c59b08d59ff7169dda1d7f10d Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Mon, 9 Mar 2009 16:00:22 -0400
Subject: [PATCH] --- yaml --- r: 140895 b: refs/heads/master c:
 9cc26a261d43e5898287a1f5808132f8f05ceb1c h: refs/heads/master i:   140893:
 1401586019c524bc568f9054a956ad9596a2059b   140891:
 16dfcdda24814ce0a4fbf3661d3fc95cb0620dd7   140887:
 414d5382264b24ba99c3c508d571a48173cd4327   140879:
 05808f9ec845b1fe7691d977eec1ae028440903b   140863:
 35dcd73de7d6d71c532b3dd040147e821cdf9446 v: v3

---
 [refs]                                    | 2 +-
 trunk/kernel/trace/events.c               | 4 +---
 trunk/kernel/trace/trace_events_stage_3.h | 4 ++--
 trunk/kernel/trace/trace_selftest.c       | 6 ++----
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 309a90b02129..be904cb2bb28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2939b0469d04ba9ac791aca9a81625d7eb50662b
+refs/heads/master: 9cc26a261d43e5898287a1f5808132f8f05ceb1c
diff --git a/trunk/kernel/trace/events.c b/trunk/kernel/trace/events.c
index f2509cbaacea..9fc918da404f 100644
--- a/trunk/kernel/trace/events.c
+++ b/trunk/kernel/trace/events.c
@@ -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>
 
diff --git a/trunk/kernel/trace/trace_events_stage_3.h b/trunk/kernel/trace/trace_events_stage_3.h
index 557ca52bcdcd..41b82b93c9c7 100644
--- a/trunk/kernel/trace/trace_events_stage_3.h
+++ b/trunk/kernel/trace/trace_events_stage_3.h
@@ -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,		\
diff --git a/trunk/kernel/trace/trace_selftest.c b/trunk/kernel/trace/trace_selftest.c
index 7238646b8723..f907a2b29028 100644
--- a/trunk/kernel/trace/trace_selftest.c
+++ b/trunk/kernel/trace/trace_selftest.c
@@ -1,5 +1,6 @@
 /* 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);