commit 750ed1a40783432d0dcb0e6c2e813a12615d7664
author Ingo Molnar <mingo@elte.hu> Mon May 12 21:20:46 2008 +0200
committer Thomas Gleixner <tglx@linutronix.de> Fri May 23 20:42:31 2008 +0200
tree dc2d0eae703ec2ad3fe9a5bc657da5dbe0af2385
parent 4bf39a9411a4ce8712954e03a9bd1592ee345919

ftrace: timestamp syncing, prepare

rename and uninline now() to ftrace_now().

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

kernel/trace/trace_functions.c

diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
index 5d8ad7a..e5d34b7 100644
--- a/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
@@ -20,7 +20,7 @@
 {
 	int cpu;
 
-	tr->time_start = now(tr->cpu);
+	tr->time_start = ftrace_now(tr->cpu);
 
 	for_each_online_cpu(cpu)
 		tracing_reset(tr->data[cpu]);