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

[sfrench/cifs-2.6.git] / kernel / trace / trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index a392bb00889dc846303b6c1dc6cd75bf54b30262..5071931eb94352672412967128a48e3fab4049e5 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1164,7 +1164,7 @@ static struct {
        { trace_clock,                  "perf",         1 },
        { ktime_get_mono_fast_ns,       "mono",         1 },
        { ktime_get_raw_fast_ns,        "mono_raw",     1 },
-       { ktime_get_boot_fast_ns,       "boot",         1 },
+       { ktime_get_mono_fast_ns,       "boot",         1 },
        ARCH_TRACE_CLOCKS
 };