diff options
author | Frederic Weisbecker <fweisbec@gmail.com> | 2008-11-25 15:07:04 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-25 19:59:45 -0500 |
commit | fb52607afcd0629776f1dc9e657647ceae81dd50 (patch) | |
tree | 7bf43b41ff8510d3098c089913cce56a9049f0fd /arch/x86/kernel/ftrace.c | |
parent | 509dceef6470442d8c7b8a43ec34125205840b3c (diff) |
tracing/function-return-tracer: change the name into function-graph-tracer
Impact: cleanup
This patch changes the name of the "return function tracer" into
function-graph-tracer which is a more suitable name for a tracing
which makes one able to retrieve the ordered call stack during
the code flow.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/ftrace.c')
-rw-r--r-- | arch/x86/kernel/ftrace.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index bb137f7297ed..3595a4c14aba 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c | |||
@@ -323,7 +323,7 @@ int __init ftrace_dyn_arch_init(void *data) | |||
323 | } | 323 | } |
324 | #endif | 324 | #endif |
325 | 325 | ||
326 | #ifdef CONFIG_FUNCTION_RET_TRACER | 326 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER |
327 | 327 | ||
328 | #ifndef CONFIG_DYNAMIC_FTRACE | 328 | #ifndef CONFIG_DYNAMIC_FTRACE |
329 | 329 | ||
@@ -389,11 +389,11 @@ static void pop_return_trace(unsigned long *ret, unsigned long long *time, | |||
389 | */ | 389 | */ |
390 | unsigned long ftrace_return_to_handler(void) | 390 | unsigned long ftrace_return_to_handler(void) |
391 | { | 391 | { |
392 | struct ftrace_retfunc trace; | 392 | struct ftrace_graph_ret trace; |
393 | pop_return_trace(&trace.ret, &trace.calltime, &trace.func, | 393 | pop_return_trace(&trace.ret, &trace.calltime, &trace.func, |
394 | &trace.overrun); | 394 | &trace.overrun); |
395 | trace.rettime = cpu_clock(raw_smp_processor_id()); | 395 | trace.rettime = cpu_clock(raw_smp_processor_id()); |
396 | ftrace_function_return(&trace); | 396 | ftrace_graph_function(&trace); |
397 | 397 | ||
398 | return trace.ret; | 398 | return trace.ret; |
399 | } | 399 | } |
@@ -440,12 +440,12 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) | |||
440 | ); | 440 | ); |
441 | 441 | ||
442 | if (WARN_ON(faulted)) { | 442 | if (WARN_ON(faulted)) { |
443 | unregister_ftrace_return(); | 443 | unregister_ftrace_graph(); |
444 | return; | 444 | return; |
445 | } | 445 | } |
446 | 446 | ||
447 | if (WARN_ON(!__kernel_text_address(old))) { | 447 | if (WARN_ON(!__kernel_text_address(old))) { |
448 | unregister_ftrace_return(); | 448 | unregister_ftrace_graph(); |
449 | *parent = old; | 449 | *parent = old; |
450 | return; | 450 | return; |
451 | } | 451 | } |
@@ -456,4 +456,4 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) | |||
456 | *parent = old; | 456 | *parent = old; |
457 | } | 457 | } |
458 | 458 | ||
459 | #endif /* CONFIG_FUNCTION_RET_TRACER */ | 459 | #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ |