diff options
author | Steven Rostedt <srostedt@redhat.com> | 2009-03-09 16:00:22 -0400 |
---|---|---|
committer | Steven Rostedt <srostedt@redhat.com> | 2009-03-10 00:35:05 -0400 |
commit | 9cc26a261d43e5898287a1f5808132f8f05ceb1c (patch) | |
tree | cf00e838e7f026d20500d8f90191230ed3f41078 /kernel/trace/trace_selftest.c | |
parent | 2939b0469d04ba9ac791aca9a81625d7eb50662b (diff) |
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: Steven Rostedt <srostedt@redhat.com>
Diffstat (limited to 'kernel/trace/trace_selftest.c')
-rw-r--r-- | kernel/trace/trace_selftest.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c index 7238646b8723..f907a2b29028 100644 --- a/kernel/trace/trace_selftest.c +++ b/kernel/trace/trace_selftest.c | |||
@@ -1,5 +1,6 @@ | |||
1 | /* Include in trace.c */ | 1 | /* Include in trace.c */ |
2 | 2 | ||
3 | #include <linux/stringify.h> | ||
3 | #include <linux/kthread.h> | 4 | #include <linux/kthread.h> |
4 | #include <linux/delay.h> | 5 | #include <linux/delay.h> |
5 | 6 | ||
@@ -100,9 +101,6 @@ static inline void warn_failed_init_tracer(struct tracer *trace, int init_ret) | |||
100 | 101 | ||
101 | #ifdef CONFIG_DYNAMIC_FTRACE | 102 | #ifdef CONFIG_DYNAMIC_FTRACE |
102 | 103 | ||
103 | #define __STR(x) #x | ||
104 | #define STR(x) __STR(x) | ||
105 | |||
106 | /* Test dynamic code modification and ftrace filters */ | 104 | /* Test dynamic code modification and ftrace filters */ |
107 | int trace_selftest_startup_dynamic_tracing(struct tracer *trace, | 105 | int trace_selftest_startup_dynamic_tracing(struct tracer *trace, |
108 | struct trace_array *tr, | 106 | struct trace_array *tr, |
@@ -130,7 +128,7 @@ int trace_selftest_startup_dynamic_tracing(struct tracer *trace, | |||
130 | * start of the function names. We simply put a '*' to | 128 | * start of the function names. We simply put a '*' to |
131 | * accommodate them. | 129 | * accommodate them. |
132 | */ | 130 | */ |
133 | func_name = "*" STR(DYN_FTRACE_TEST_NAME); | 131 | func_name = "*" __stringify(DYN_FTRACE_TEST_NAME); |
134 | 132 | ||
135 | /* filter only on our function */ | 133 | /* filter only on our function */ |
136 | ftrace_set_filter(func_name, strlen(func_name), 1); | 134 | ftrace_set_filter(func_name, strlen(func_name), 1); |