From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759953AbYGKBBJ (ORCPT ); Thu, 10 Jul 2008 21:01:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756020AbYGKA7z (ORCPT ); Thu, 10 Jul 2008 20:59:55 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:36789 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755713AbYGKA7w (ORCPT ); Thu, 10 Jul 2008 20:59:52 -0400 Message-Id: <20080711005950.848362449@goodmis.org> References: <20080711005808.316194101@goodmis.org> User-Agent: quilt/0.46-1 Date: Thu, 10 Jul 2008 20:58:13 -0400 From: Steven Rostedt To: Peter Zijlstra , Ingo Molnar , Thomas Gleixner , Andrew Morton , linux-kernel@vger.kernel.org Cc: Steven Rostedt Subject: [PATCH 5/8] ftrace: start wakeup tracing after setting function tracer Content-Disposition: inline; filename=ftrace-wakeup-enable-tracing-last-on-startup.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- kernel/trace/trace_sched_wakeup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: linux-tip.git/kernel/trace/trace_sched_wakeup.c =================================================================== --- linux-tip.git.orig/kernel/trace/trace_sched_wakeup.c 2008-07-10 12:19:54.000000000 -0400 +++ linux-tip.git/kernel/trace/trace_sched_wakeup.c 2008-07-10 12:54:09.000000000 -0400 @@ -352,9 +352,10 @@ static void start_wakeup_tracer(struct t */ 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", --