public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH][GIT PULL] tracing: Fix compile issue for trace_sched_wakeup.c
@ 2010-10-19 17:11 Steven Rostedt
  2010-10-19 18:41 ` Ingo Molnar
  0 siblings, 1 reply; 50+ messages in thread
From: Steven Rostedt @ 2010-10-19 17:11 UTC (permalink / raw)
  To: LKML; +Cc: Ingo Molnar, Andrew Morton, Frederic Weisbecker


Ingo,

Please pull the latest tip/perf/core tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/perf/core


Steven Rostedt (1):
      tracing: Fix compile issue for trace_sched_wakeup.c

----
 kernel/trace/trace_sched_wakeup.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---------------------------
commit 7e40798f406fe73f9bac496a390daabd8768a8f7
Author: Steven Rostedt <srostedt@redhat.com>
Date:   Tue Oct 19 10:56:19 2010 -0400

    tracing: Fix compile issue for trace_sched_wakeup.c
    
    The function start_func_tracer() was incorrectly added in the
     #ifdef CONFIG_FUNCTION_TRACER condition, but is still used even
    when function tracing is not enabled.
    
    The calls to register_ftrace_function() and register_ftrace_graph()
    become nops (and their arguments are even ignored), thus there is
    no reason to hide start_func_tracer() when function tracing is
    not enabled.
    
    Reported-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c
index 31689d2..7319559 100644
--- a/kernel/trace/trace_sched_wakeup.c
+++ b/kernel/trace/trace_sched_wakeup.c
@@ -130,6 +130,7 @@ static struct ftrace_ops trace_ops __read_mostly =
 {
 	.func = wakeup_tracer_call,
 };
+#endif /* CONFIG_FUNCTION_TRACER */
 
 static int start_func_tracer(int graph)
 {
@@ -159,8 +160,6 @@ static void stop_func_tracer(int graph)
 		unregister_ftrace_graph();
 }
 
-#endif /* CONFIG_FUNCTION_TRACER */
-
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 static int wakeup_set_flag(u32 old_flags, u32 bit, int set)
 {



^ permalink raw reply related	[flat|nested] 50+ messages in thread
end of thread, other threads:[~2010-10-30 10:42 UTC | newest]

Thread overview: 50+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-19 17:11 [PATCH][GIT PULL] tracing: Fix compile issue for trace_sched_wakeup.c Steven Rostedt
2010-10-19 18:41 ` Ingo Molnar
2010-10-20 15:40   ` Ingo Molnar
2010-10-20 16:37     ` Steven Rostedt
2010-10-20 18:40       ` Ingo Molnar
2010-10-20 16:43     ` Jason Baron
2010-10-20 18:33       ` Ingo Molnar
2010-10-21 11:09         ` Ingo Molnar
2010-10-22 17:58           ` Jason Baron
2010-10-22 18:24             ` Ingo Molnar
2010-10-22 18:39               ` Jason Baron
2010-10-23 20:02                 ` Ingo Molnar
2010-10-24  0:53                   ` Steven Rostedt
2010-10-24 11:25                     ` Ingo Molnar
2010-10-25  8:59                       ` Ingo Molnar
2010-10-25  9:30                         ` Ingo Molnar
2010-10-25 11:45                           ` Ingo Molnar
2010-10-25 12:10                             ` Ingo Molnar
2010-10-25 12:18                               ` Peter Zijlstra
2010-10-25 12:32                                 ` Ingo Molnar
2010-10-25 15:47                                 ` Peter Zijlstra
2010-10-25 16:07                                   ` Peter Zijlstra
2010-10-25 17:25                                   ` Ingo Molnar
2010-10-25 17:32                                     ` Ingo Molnar
2010-10-25 17:45                                   ` Peter Zijlstra
2010-10-25 17:52                                     ` Jason Baron
2010-10-30 10:42                                     ` [tip:perf/urgent] jump label: Add work around to i386 gcc asm goto bug tip-bot for Steven Rostedt
2010-10-25 15:55                   ` [PATCH][GIT PULL] tracing: Fix compile issue for trace_sched_wakeup.c Jason Baron
2010-10-25 16:09                     ` Peter Zijlstra
2010-10-22 21:42               ` Jason Baron
2010-10-23  4:41                 ` Steven Rostedt
2010-10-21  2:58       ` Masami Hiramatsu
2010-10-21  7:22         ` Peter Zijlstra
2010-10-21 11:01           ` Steven Rostedt
2010-10-21 11:03             ` Peter Zijlstra
2010-10-21 12:45               ` Steven Rostedt
2010-10-21 13:50               ` Jason Baron
2010-10-22  4:56               ` Masami Hiramatsu
2010-10-21 14:00         ` Jason Baron
2010-10-21 11:14     ` Steven Rostedt
2010-10-21 11:26       ` Ingo Molnar
2010-10-21 13:55         ` Jason Baron
2010-10-21 14:43           ` Ingo Molnar
2010-10-22  1:44         ` Jason Baron
2010-10-22  8:14           ` Peter Zijlstra
2010-10-22 14:13             ` Jason Baron
2010-10-22 14:23               ` Peter Zijlstra
2010-10-22 14:36                 ` Steven Rostedt
2010-10-22 14:36                 ` Jason Baron
2010-10-22  8:16           ` Tejun Heo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox