aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2008-10-23 09:33:02 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-23 10:00:19 -0400
commit81adbdc029ecc416d56563e7f159100181dd711d (patch)
treeff7ed7b0fb284c22eb30e690a85e2e9e083c4162 /kernel/trace/trace.c
parentab9a0918cbf0fa8883301838df8dbc8fc085ff50 (diff)
ftrace: only have ftrace_kill atomic
When an anomaly is detected, we need a way to completely disable ftrace. Right now we have two functions: ftrace_kill and ftrace_kill_atomic. The ftrace_kill tries to do it in a "nice" way by converting everything back to a nop. The "nice" way is dangerous itself, so this patch removes it and only has the "atomic" version, which is all that is needed. Signed-off-by: Steven Rostedt <srostedt@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r--kernel/trace/trace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index aeb2f2505bc5..333a5162149b 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3097,7 +3097,7 @@ void ftrace_dump(void)
3097 dump_ran = 1; 3097 dump_ran = 1;
3098 3098
3099 /* No turning back! */ 3099 /* No turning back! */
3100 ftrace_kill_atomic(); 3100 ftrace_kill();
3101 3101
3102 for_each_tracing_cpu(cpu) { 3102 for_each_tracing_cpu(cpu) {
3103 atomic_inc(&global_trace.data[cpu]->disabled); 3103 atomic_inc(&global_trace.data[cpu]->disabled);