diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-14 15:58:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-14 15:58:35 +0200 |
| commit | 6712e299b7dc78aa4971b85e803435ee6d49a9dd (patch) | |
| tree | b3d17a2d068737ec07727b28e93c7d374c27721b /kernel/trace/trace_sched_wakeup.c | |
| parent | ec1bb60bbff0386c3ec25360e7a8c72f467a6ff1 (diff) | |
| parent | b2613e370dbeb69edbff989382fa54f2395aa471 (diff) | |
Merge branch 'tracing/ftrace' into auto-ftrace-next
Diffstat (limited to 'kernel/trace/trace_sched_wakeup.c')
| -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) */ smp_wmb(); - tracer_enabled = 1; register_ftrace_function(&trace_ops); + tracer_enabled = 1; + return; fail_deprobe_wake_new: marker_probe_unregister("kernel_sched_wakeup_new", |