summaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2013-03-14 13:13:45 -0400
committerSteven Rostedt <rostedt@goodmis.org>2013-03-15 00:36:09 -0400
commit8aacf017b065a805d27467843490c976835eb4a5 (patch)
tree3e3ee23502cf2cc6d02baa1f7625b1ef16611eda /kernel/trace/trace.c
parent328df4759c03e2c3e7429cc6cb0e180c38f32063 (diff)
downloadlinux-stable-8aacf017b065a805d27467843490c976835eb4a5.tar.gz
linux-stable-8aacf017b065a805d27467843490c976835eb4a5.tar.bz2
linux-stable-8aacf017b065a805d27467843490c976835eb4a5.zip
tracing: Add "uptime" trace clock that uses jiffies
Add a simple trace clock called "uptime" for those that are interested in the uptime of the trace. It uses jiffies as that's the safest method, as other uptime clocks grab seq locks, which could cause a deadlock if taken from an event or function tracer. Requested-by: Mauro Carvalho Chehab <mchehab@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r--kernel/trace/trace.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index f90ca16afcf2..8eabfbb8003e 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -647,6 +647,7 @@ static struct {
{ trace_clock_local, "local", 1 },
{ trace_clock_global, "global", 1 },
{ trace_clock_counter, "counter", 0 },
+ { trace_clock_jiffies, "uptime", 1 },
ARCH_TRACE_CLOCKS
};