summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRajesh Bhagat <rajesh.lnx@gmail.com>2012-02-17 13:59:15 +0530
committerSteven Rostedt <rostedt@goodmis.org>2012-03-13 15:07:37 -0400
commitdb6544e0075d192e5ad16eda8689c55fa9c6f8f4 (patch)
tree5c48606c4769afc28bc8382d8ff3c6f2d14b0b03 /kernel
parentb892e5c89787716b95a8e55d77d25a1c0748df10 (diff)
downloadlinux-stable-db6544e0075d192e5ad16eda8689c55fa9c6f8f4.tar.gz
linux-stable-db6544e0075d192e5ad16eda8689c55fa9c6f8f4.tar.bz2
linux-stable-db6544e0075d192e5ad16eda8689c55fa9c6f8f4.zip
ftrace: Fix function_graph for archs that test ftrace_trace_function
When CONFIG_DYNAMIC_FTRACE is not set, some archs (ARM) test the variable function_trace_function to determine if it should call the function tracer. If it is not set to ftrace_stub, then it will call the function and return, and not call the function graph tracer. But some of these archs (ARM) do not have the assembly code to test if function tracing is enabled or not (quick stop of tracing) and it calls the helper routine ftrace_test_stop_func() instead. If function tracer is enabled and then disabled, the variable ftrace_trace_function is still set to the helper routine ftrace_test_stop_func(), and not to ftrace_stub. This will prevent the function graph tracer from ever running. Output before patch /debug/tracing # echo function > current_tracer /debug/tracing # echo function_graph > current_tracer /debug/tracing # cat trace Output after patch /debug/tracing # echo function > current_tracer /debug/tracing # echo function_graph > current_tracer /debug/tracing # cat trace 0) ! 253.375 us | } /* irq_enter */ 0) | generic_handle_irq() { 0) | handle_fasteoi_irq() { 0) 9.208 us | _raw_spin_lock(); 0) | handle_irq_event() { 0) | handle_irq_event_percpu() { Signed-off-by: Rajesh Bhagat <rajesh.lnx@gmail.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/ftrace.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 867bd1dd2dd0..0fa92f677c92 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -249,7 +249,8 @@ static void update_ftrace_function(void)
#else
__ftrace_trace_function = func;
#endif
- ftrace_trace_function = ftrace_test_stop_func;
+ ftrace_trace_function =
+ (func == ftrace_stub) ? func : ftrace_test_stop_func;
#endif
}