diff options
| author | Ingo Molnar | 2009-03-06 11:39:18 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-03-06 11:39:18 +0100 |
| commit | 16097439703bcd38e9fe5608c12add6dacb825ea (patch) | |
| tree | 9f6572fefdeb3e7c61f701ed9a86979d5525ccd8 /arch | |
| parent | tracing: clean up menu (diff) | |
| parent | tracing/function-graph-tracer: use the more lightweight local clock (diff) | |
| download | kernel-qcow2-linux-16097439703bcd38e9fe5608c12add6dacb825ea.tar.gz kernel-qcow2-linux-16097439703bcd38e9fe5608c12add6dacb825ea.tar.xz kernel-qcow2-linux-16097439703bcd38e9fe5608c12add6dacb825ea.zip | |
Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/ftrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 3925ec0184b1..a85da1764b1c 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) { |