aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-06 11:39:18 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-06 11:39:18 +0100
commit16097439703bcd38e9fe5608c12add6dacb825ea (patch)
tree9f6572fefdeb3e7c61f701ed9a86979d5525ccd8 /kernel
parent40ada30f9621fbd831ac2437b9a2a399aad34b00 (diff)
parent0012693ad4f636c720fed3802027f9427962f540 (diff)
Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace_functions_graph.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index c009553a8e8..e527f2f66c7 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)) {