diff options
| author | Petr Mladek <pmladek@suse.com> | 2025-12-01 14:14:34 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2025-12-01 14:14:34 +0100 |
| commit | 3869e431b51f3010f0d3bfc007c4a1b957c0ae1f (patch) | |
| tree | cae985276ee0de390f9d127147f29612385e90c4 /kernel/trace/trace_output.c | |
| parent | a9f349e3c0bebe7ae97750b32a72f452bdf707e2 (diff) | |
| parent | ace38521705bd79a47e5f46b6bae6dc044f3cfdc (diff) | |
Merge branch 'for-6.19-vsprintf-timespec64' into for-linus
Diffstat (limited to 'kernel/trace/trace_output.c')
| -rw-r--r-- | kernel/trace/trace_output.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index 97db0b0ccf3e..14f86f0a8bc7 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -1467,12 +1467,12 @@ trace_hwlat_print(struct trace_iterator *iter, int flags, trace_assign_type(field, entry); - trace_seq_printf(s, "#%-5u inner/outer(us): %4llu/%-5llu ts:%lld.%09ld count:%d", + trace_seq_printf(s, "#%-5u inner/outer(us): %4llu/%-5llu ts:%ptSp count:%d", field->seqnum, field->duration, field->outer_duration, - (long long)field->timestamp.tv_sec, - field->timestamp.tv_nsec, field->count); + &field->timestamp, + field->count); if (field->nmi_count) { /* |