diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-12-01 13:57:58 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-12-01 13:57:58 -0800 |
| commit | fa40ddf73c5d6c5c57fc6e79833ec48eb99cbf52 (patch) | |
| tree | 977559221fb383bdcf337df9a52d6998eaa4f70f /kernel/trace/trace.c | |
| parent | f225dbdca9127536b7296778b3b0cfd96f65df00 (diff) | |
| parent | 25dcb75878cd3b685a70c688758a4d3726e92703 (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index bff7d4c69274..293af3346c8c 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -890,6 +890,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 }, ARCH_TRACE_CLOCKS }; |