aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_sched_wakeup.c
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2010-10-19 10:56:19 -0400
committerSteven Rostedt <rostedt@goodmis.org>2010-10-19 10:56:19 -0400
commit7e40798f406fe73f9bac496a390daabd8768a8f7 (patch)
treec75eee47b3d324218c53bf4f6af5b2fa9780d1db /kernel/trace/trace_sched_wakeup.c
parent78c89ba121221d9224a5747803d7fffe51cd6e44 (diff)
downloadmrst-s0i3-test-7e40798f406fe73f9bac496a390daabd8768a8f7.tar.gz
mrst-s0i3-test-7e40798f406fe73f9bac496a390daabd8768a8f7.tar.xz
mrst-s0i3-test-7e40798f406fe73f9bac496a390daabd8768a8f7.zip
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>
Diffstat (limited to 'kernel/trace/trace_sched_wakeup.c')
-rw-r--r--kernel/trace/trace_sched_wakeup.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c
index 31689d2df7f..7319559ed59 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)
{