diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-06 05:39:18 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-06 05:39:18 -0500 |
| commit | 16097439703bcd38e9fe5608c12add6dacb825ea (patch) | |
| tree | 9f6572fefdeb3e7c61f701ed9a86979d5525ccd8 /kernel | |
| parent | 40ada30f9621fbd831ac2437b9a2a399aad34b00 (diff) | |
| parent | 0012693ad4f636c720fed3802027f9427962f540 (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.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) | |||
| 112 | unsigned long ret; | 112 | unsigned long ret; |
| 113 | 113 | ||
| 114 | ftrace_pop_return_trace(&trace, &ret); | 114 | ftrace_pop_return_trace(&trace, &ret); |
| 115 | trace.rettime = cpu_clock(raw_smp_processor_id()); | 115 | trace.rettime = trace_clock_local(); |
| 116 | ftrace_graph_return(&trace); | 116 | ftrace_graph_return(&trace); |
| 117 | 117 | ||
| 118 | if (unlikely(!ret)) { | 118 | if (unlikely(!ret)) { |