From c6f21427df37cb33ebb4fdfa229a9493f4540c12 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Thu, 10 Jul 2008 20:58:13 -0400 Subject: [PATCH] --- yaml --- r: 100647 b: refs/heads/master c: ad591240ceadcaf41b2a88855ca5f1c77c5a0298 h: refs/heads/master i: 100645: 3a1a08c64f755d463d4202baebfd562fe93941ee 100643: b234c50fd0edc12b9fff36139f104954a593ddf4 100639: f25af7e45dd3c641ab7aee4518cc62b3ce5db39e v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_sched_wakeup.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f77dad39f699..3ed608c9d201 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5c21b4514b38f450848feb432f7120376d01ffe +refs/heads/master: ad591240ceadcaf41b2a88855ca5f1c77c5a0298 diff --git a/trunk/kernel/trace/trace_sched_wakeup.c b/trunk/kernel/trace/trace_sched_wakeup.c index bf7e91caef57..3c8d61df4474 100644 --- a/trunk/kernel/trace/trace_sched_wakeup.c +++ b/trunk/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",