aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_selftest.c
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2011-05-05 22:54:01 -0400
committerSteven Rostedt <rostedt@goodmis.org>2011-05-18 19:22:52 -0400
commit936e074b286ae779f134312178dbab139ee7ea52 (patch)
tree6b0497be4d5e6258ad9b1ec99b2a9feb25b2dd22 /kernel/trace/trace_selftest.c
parentcdbe61bfe70440939e457fb4a8d0995eaaed17de (diff)
ftrace: Modify ftrace_set_filter/notrace to take ops
Since users of the function tracer can now pick and choose which functions they want to trace agnostically from other users of the function tracer, we need to pass the ops struct to the ftrace_set_filter() functions. The functions ftrace_set_global_filter() and ftrace_set_global_notrace() is added to keep the old filter functions which are used to modify the generic function tracers. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace_selftest.c')
-rw-r--r--kernel/trace/trace_selftest.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
index 659732eba07c..0fa2db305b7c 100644
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
@@ -131,7 +131,7 @@ int trace_selftest_startup_dynamic_tracing(struct tracer *trace,
131 func_name = "*" __stringify(DYN_FTRACE_TEST_NAME); 131 func_name = "*" __stringify(DYN_FTRACE_TEST_NAME);
132 132
133 /* filter only on our function */ 133 /* filter only on our function */
134 ftrace_set_filter(func_name, strlen(func_name), 1); 134 ftrace_set_global_filter(func_name, strlen(func_name), 1);
135 135
136 /* enable tracing */ 136 /* enable tracing */
137 ret = tracer_init(trace, tr); 137 ret = tracer_init(trace, tr);
@@ -181,7 +181,7 @@ int trace_selftest_startup_dynamic_tracing(struct tracer *trace,
181 tracer_enabled = save_tracer_enabled; 181 tracer_enabled = save_tracer_enabled;
182 182
183 /* Enable tracing on all functions again */ 183 /* Enable tracing on all functions again */
184 ftrace_set_filter(NULL, 0, 1); 184 ftrace_set_global_filter(NULL, 0, 1);
185 185
186 return ret; 186 return ret;
187} 187}