Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / kernel / trace / trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 8bb80fe..8a52839 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -820,11 +820,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",       0 },
-       { trace_clock,          "perf",         1 },
+       { trace_clock_local,            "local",        1 },
+       { trace_clock_global,           "global",       1 },
+       { trace_clock_counter,          "counter",      0 },
+       { trace_clock_jiffies,          "uptime",       0 },
+       { trace_clock,                  "perf",         1 },
+       { ktime_get_mono_fast_ns,       "mono",         1 },
        ARCH_TRACE_CLOCKS
 };