diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-07-16 23:05:25 +0200 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2014-07-24 00:01:55 +0200 |
| commit | 1b3e5c0936046e7e023149ddc8946d21c2ea20eb (patch) | |
| tree | 0f632b1885a40a94be2ef853e993c95e88042cf6 /kernel | |
| parent | timekeeping: Provide fast and NMI safe access to CLOCK_MONOTONIC (diff) | |
| download | linux-1b3e5c0936046e7e023149ddc8946d21c2ea20eb.tar.xz linux-1b3e5c0936046e7e023149ddc8946d21c2ea20eb.zip | |
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.c | 11 |
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 { 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 }; |