diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-03-06 11:39:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-06 11:39:18 +0100 |
| commit | 16097439703bcd38e9fe5608c12add6dacb825ea (patch) | |
| tree | 9f6572fefdeb3e7c61f701ed9a86979d5525ccd8 /kernel/trace/trace_functions_graph.c | |
| parent | tracing: clean up menu (diff) | |
| parent | tracing/function-graph-tracer: use the more lightweight local clock (diff) | |
| download | linux-dev-16097439703bcd38e9fe5608c12add6dacb825ea.tar.xz linux-dev-16097439703bcd38e9fe5608c12add6dacb825ea.zip | |
Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core
Diffstat (limited to 'kernel/trace/trace_functions_graph.c')
| -rw-r--r-- | kernel/trace/trace_functions_graph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index c009553a8e81..e527f2f66c73 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -112,7 +112,7 @@ unsigned long ftrace_return_to_handler(void) unsigned long ret; ftrace_pop_return_trace(&trace, &ret); - trace.rettime = cpu_clock(raw_smp_processor_id()); + trace.rettime = trace_clock_local(); ftrace_graph_return(&trace); if (unlikely(!ret)) { |