aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2009-03-23 23:38:49 -0400
committerSteven Rostedt <srostedt@redhat.com>2009-03-24 09:31:34 -0400
commit5d1a03dc541dc6672e60e57249ed22f40654ca47 (patch)
tree0b72061cc8c56797474d2efbfe1954ce0ad27ce8 /arch
parent098335215a4921a8a54193829eaed602dca24df5 (diff)
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')
-rw-r--r--arch/x86/kernel/ftrace.c6
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)
410void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) 410void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
411{ 411{
412 unsigned long old; 412 unsigned long old;
413 unsigned long long calltime;
414 int faulted; 413 int faulted;
415 struct ftrace_graph_ent trace; 414 struct ftrace_graph_ent trace;
416 unsigned long return_hooker = (unsigned long) 415 unsigned long return_hooker = (unsigned long)
@@ -453,10 +452,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
453 return; 452 return;
454 } 453 }
455 454
456 calltime = trace_clock_local(); 455 if (ftrace_push_return_trace(old, self_addr, &trace.depth) == -EBUSY) {
457
458 if (ftrace_push_return_trace(old, calltime,
459 self_addr, &trace.depth) == -EBUSY) {
460 *parent = old; 456 *parent = old;
461 return; 457 return;
462 } 458 }