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 /arch | |
| parent | 40ada30f9621fbd831ac2437b9a2a399aad34b00 (diff) | |
| parent | 0012693ad4f636c720fed3802027f9427962f540 (diff) | |
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) | |||
| 436 | return; | 436 | return; |
| 437 | } | 437 | } |
| 438 | 438 | ||
| 439 | calltime = cpu_clock(raw_smp_processor_id()); | 439 | calltime = trace_clock_local(); |
| 440 | 440 | ||
| 441 | if (ftrace_push_return_trace(old, calltime, | 441 | if (ftrace_push_return_trace(old, calltime, |
| 442 | self_addr, &trace.depth) == -EBUSY) { | 442 | self_addr, &trace.depth) == -EBUSY) { |