From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 16 Jul 2014 21:05:25 +0000 (+0000)
Subject: ftrace: Provide trace clocks monotonic
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1b3e5c0936046e7e023149ddc8946d21c2ea20eb;p=linux-beck.git

ftrace: Provide trace clocks monotonic

Expose the new NMI safe accessor to clock monotonic to the tracer.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index f243444a3772..84e2b45c0934 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -806,11 +806,12 @@ static struct {
 	const char *name;
 	int in_ns;		/* is this clock in nanoseconds? */
 } trace_clocks[] = {
-	{ trace_clock_local,	"local",	1 },
-	{ trace_clock_global,	"global",	1 },
-	{ trace_clock_counter,	"counter",	0 },
-	{ trace_clock_jiffies,	"uptime",	1 },
-	{ trace_clock,		"perf",		1 },
+	{ trace_clock_local,		"local",	1 },
+	{ trace_clock_global,		"global",	1 },
+	{ trace_clock_counter,		"counter",	0 },
+	{ trace_clock_jiffies,		"uptime",	1 },
+	{ trace_clock,			"perf",		1 },
+	{ ktime_get_mono_fast_ns,	"mono",		1 },
 	ARCH_TRACE_CLOCKS
 };