aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
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 /arch/x86
parent40ada30f9621fbd831ac2437b9a2a399aad34b00 (diff)
parent0012693ad4f636c720fed3802027f9427962f540 (diff)
Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/ftrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 3925ec0184b..a85da1764b1 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -436,7 +436,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
return;
}
- calltime = cpu_clock(raw_smp_processor_id());
+ calltime = trace_clock_local();
if (ftrace_push_return_trace(old, calltime,
self_addr, &trace.depth) == -EBUSY) {