aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-07-16 17:05:25 -0400
committerJohn Stultz <john.stultz@linaro.org>2014-07-23 18:01:55 -0400
commit1b3e5c0936046e7e023149ddc8946d21c2ea20eb (patch)
tree0f632b1885a40a94be2ef853e993c95e88042cf6 /kernel
parent4396e058c52e167729729cf64ea3dfa229637086 (diff)
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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace.c11
1 files changed, 6 insertions, 5 deletions
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 {
806 const char *name; 806 const char *name;
807 int in_ns; /* is this clock in nanoseconds? */ 807 int in_ns; /* is this clock in nanoseconds? */
808} trace_clocks[] = { 808} trace_clocks[] = {
809 { trace_clock_local, "local", 1 }, 809 { trace_clock_local, "local", 1 },
810 { trace_clock_global, "global", 1 }, 810 { trace_clock_global, "global", 1 },
811 { trace_clock_counter, "counter", 0 }, 811 { trace_clock_counter, "counter", 0 },
812 { trace_clock_jiffies, "uptime", 1 }, 812 { trace_clock_jiffies, "uptime", 1 },
813 { trace_clock, "perf", 1 }, 813 { trace_clock, "perf", 1 },
814 { ktime_get_mono_fast_ns, "mono", 1 },
814 ARCH_TRACE_CLOCKS 815 ARCH_TRACE_CLOCKS
815}; 816};
816 817