diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-03-28 10:56:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-03-28 10:58:28 +0100 |
| commit | cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb (patch) | |
| tree | 52591d7b53600d5d39369525a356ccb81e22fcd9 /tools/perf/util/time-utils.c | |
| parent | db779ef67ffeadbb44e9e818eb64dbe528e2f48f (diff) | |
| parent | 8c2ffd9174779014c3fe1f96d9dc3641d9175f00 (diff) | |
| download | blackbird-op-linux-cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb.tar.gz blackbird-op-linux-cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb.zip | |
Merge tag 'v5.1-rc2' into core/urgent, to resolve a conflict
Conflicts:
include/linux/kcore.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/time-utils.c')
| -rw-r--r-- | tools/perf/util/time-utils.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/perf/util/time-utils.c b/tools/perf/util/time-utils.c index 0f53baec660e..20663a460df3 100644 --- a/tools/perf/util/time-utils.c +++ b/tools/perf/util/time-utils.c @@ -453,6 +453,14 @@ int timestamp__scnprintf_usec(u64 timestamp, char *buf, size_t sz) return scnprintf(buf, sz, "%"PRIu64".%06"PRIu64, sec, usec); } +int timestamp__scnprintf_nsec(u64 timestamp, char *buf, size_t sz) +{ + u64 sec = timestamp / NSEC_PER_SEC, + nsec = timestamp % NSEC_PER_SEC; + + return scnprintf(buf, sz, "%" PRIu64 ".%09" PRIu64, sec, nsec); +} + int fetch_current_timestamp(char *buf, size_t sz) { struct timeval tv; |
