diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2009-03-24 04:38:49 +0100 |
|---|---|---|
| committer | Steven Rostedt <srostedt@redhat.com> | 2009-03-24 14:31:34 +0100 |
| commit | 5d1a03dc541dc6672e60e57249ed22f40654ca47 (patch) | |
| tree | 0b72061cc8c56797474d2efbfe1954ce0ad27ce8 /arch/x86/kernel/ftrace.c | |
| parent | tracing: fix memory leak in trace_stat (diff) | |
| download | linux-5d1a03dc541dc6672e60e57249ed22f40654ca47.tar.xz linux-5d1a03dc541dc6672e60e57249ed22f40654ca47.zip | |
function-graph: moved the timestamp from arch to generic code
This patch move the timestamp from happening in the arch specific
code into the general code. This allows for better control by the tracer
to time manipulation.
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Diffstat (limited to 'arch/x86/kernel/ftrace.c')
| -rw-r--r-- | arch/x86/kernel/ftrace.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 57b33edb7ce3..61df77532120 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -410,7 +410,6 @@ int ftrace_disable_ftrace_graph_caller(void) void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) { unsigned long old; - unsigned long long calltime; int faulted; struct ftrace_graph_ent trace; unsigned long return_hooker = (unsigned long) @@ -453,10 +452,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) return; } - calltime = trace_clock_local(); - - if (ftrace_push_return_trace(old, calltime, - self_addr, &trace.depth) == -EBUSY) { + if (ftrace_push_return_trace(old, self_addr, &trace.depth) == -EBUSY) { *parent = old; return; } |