Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core

This commit is contained in:
Ingo Molnar
2009-03-06 11:39:18 +01:00
3 changed files with 9 additions and 8 deletions
+1 -1
View File
@@ -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)) {