summaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-05-12 21:20:46 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-05-23 20:42:31 +0200
commit750ed1a40783432d0dcb0e6c2e813a12615d7664 (patch)
treedc2d0eae703ec2ad3fe9a5bc657da5dbe0af2385 /kernel/trace/trace.h
parent4bf39a9411a4ce8712954e03a9bd1592ee345919 (diff)
downloadblackbird-op-linux-750ed1a40783432d0dcb0e6c2e813a12615d7664.tar.gz
blackbird-op-linux-750ed1a40783432d0dcb0e6c2e813a12615d7664.zip
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>
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r--kernel/trace/trace.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index b0408356f0e0..30cad677e9d0 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -171,10 +171,7 @@ void update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu);
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
OpenPOWER on IntegriCloud