diff options
author | Steven Rostedt <rostedt@goodmis.org> | 2008-07-10 20:58:13 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-11 09:49:20 -0400 |
commit | ad591240ceadcaf41b2a88855ca5f1c77c5a0298 (patch) | |
tree | 8ace309f09fd6d1cbbf422452618297714654f81 /kernel/trace | |
parent | b5c21b4514b38f450848feb432f7120376d01ffe (diff) |
ftrace: start wakeup tracing after setting function tracer
Enabling the wakeup tracer before enabling the function tracing causes
some strange results due to the dynamic enabling of the functions.
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Cc: Steven Rostedt <srostedt@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace')
-rw-r--r-- | kernel/trace/trace_sched_wakeup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c index bf7e91caef57..3c8d61df4474 100644 --- a/kernel/trace/trace_sched_wakeup.c +++ b/kernel/trace/trace_sched_wakeup.c | |||
@@ -352,9 +352,10 @@ static void start_wakeup_tracer(struct trace_array *tr) | |||
352 | */ | 352 | */ |
353 | smp_wmb(); | 353 | smp_wmb(); |
354 | 354 | ||
355 | tracer_enabled = 1; | ||
356 | register_ftrace_function(&trace_ops); | 355 | register_ftrace_function(&trace_ops); |
357 | 356 | ||
357 | tracer_enabled = 1; | ||
358 | |||
358 | return; | 359 | return; |
359 | fail_deprobe_wake_new: | 360 | fail_deprobe_wake_new: |
360 | marker_probe_unregister("kernel_sched_wakeup_new", | 361 | marker_probe_unregister("kernel_sched_wakeup_new", |