Messages in this thread Patch in this message | | | Subject | [PATCH][GIT PULL] tracing: Fix compile issue for trace_sched_wakeup.c | From | Steven Rostedt <> | Date | Tue, 19 Oct 2010 13:11:22 -0400 |
| |
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) {
| |