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.h

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index b040835..30cad67 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -171,10 +171,7 @@
 void update_max_tr_single(struct trace_array *tr,
 			  struct task_struct *tsk, int cpu);
 
-static inline notrace cycle_t now(int cpu)
-{
-	return cpu_clock(cpu);
-}
+extern notrace cycle_t ftrace_now(int cpu);
 
 #ifdef CONFIG_SCHED_TRACER
 extern void notrace