aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2014-06-25 11:28:20 -0400
committerSteven Rostedt <rostedt@goodmis.org>2014-07-18 13:56:59 -0400
commit1820122a76c6d64adc6e2a7ff438029ffb8d7cb4 (patch)
treef96d7729ae125b4cfb794054a314559fd4e2a41d /kernel/trace
parent0ef1b9e0cfd98f91b2341d581ea9424eb4ba3aa7 (diff)
ftrace: Do no disable function tracing on enabling function tracing
When function tracing is being updated function_trace_stop is set to keep from tracing the updates. This was fine when function tracing was done from stop machine. But it is no longer done that way and this can cause real tracing to be missed. Remove it. Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/ftrace.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 8063280fd53d..0fa1b87db95c 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2261,11 +2261,6 @@ static void ftrace_run_update_code(int command)
2261 FTRACE_WARN_ON(ret); 2261 FTRACE_WARN_ON(ret);
2262 if (ret) 2262 if (ret)
2263 return; 2263 return;
2264 /*
2265 * Do not call function tracer while we update the code.
2266 * We are in stop machine.
2267 */
2268 function_trace_stop++;
2269 2264
2270 /* 2265 /*
2271 * By default we use stop_machine() to modify the code. 2266 * By default we use stop_machine() to modify the code.
@@ -2275,8 +2270,6 @@ static void ftrace_run_update_code(int command)
2275 */ 2270 */
2276 arch_ftrace_update_code(command); 2271 arch_ftrace_update_code(command);
2277 2272
2278 function_trace_stop--;
2279
2280 ret = ftrace_arch_code_modify_post_process(); 2273 ret = ftrace_arch_code_modify_post_process();
2281 FTRACE_WARN_ON(ret); 2274 FTRACE_WARN_ON(ret);
2282 2275