diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-05-05 10:01:34 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-05-05 10:01:34 +0200 |
commit | 12e2c41148a9e68bc3b261954961db9d28decf47 (patch) | |
tree | 6b52bbd4b222f3995090320b08a54fece5a12d48 /kernel/trace/trace.c | |
parent | c427f69564e2a844c5fcf2804042609342513da0 (diff) | |
parent | 1504269814263c9676b4605a6a91e14dc6ceac21 (diff) | |
download | op-kernel-dev-12e2c41148a9e68bc3b261954961db9d28decf47.zip op-kernel-dev-12e2c41148a9e68bc3b261954961db9d28decf47.tar.gz |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index dfbcf9e..414d721 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1165,7 +1165,7 @@ static struct { { trace_clock, "perf", 1 }, { ktime_get_mono_fast_ns, "mono", 1 }, { ktime_get_raw_fast_ns, "mono_raw", 1 }, - { ktime_get_mono_fast_ns, "boot", 1 }, + { ktime_get_boot_fast_ns, "boot", 1 }, ARCH_TRACE_CLOCKS }; |