diff options
Diffstat (limited to 'kernel/trace/trace_output.c')
-rw-r--r-- | kernel/trace/trace_output.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index 02a4aeb22c47..08f9bab8089e 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c | |||
@@ -4,7 +4,6 @@ | |||
4 | * Copyright (C) 2008 Red Hat Inc, Steven Rostedt <srostedt@redhat.com> | 4 | * Copyright (C) 2008 Red Hat Inc, Steven Rostedt <srostedt@redhat.com> |
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | |||
8 | #include <linux/module.h> | 7 | #include <linux/module.h> |
9 | #include <linux/mutex.h> | 8 | #include <linux/mutex.h> |
10 | #include <linux/ftrace.h> | 9 | #include <linux/ftrace.h> |
@@ -1161,11 +1160,11 @@ trace_hwlat_print(struct trace_iterator *iter, int flags, | |||
1161 | 1160 | ||
1162 | trace_assign_type(field, entry); | 1161 | trace_assign_type(field, entry); |
1163 | 1162 | ||
1164 | trace_seq_printf(s, "#%-5u inner/outer(us): %4llu/%-5llu ts:%ld.%09ld", | 1163 | trace_seq_printf(s, "#%-5u inner/outer(us): %4llu/%-5llu ts:%lld.%09ld", |
1165 | field->seqnum, | 1164 | field->seqnum, |
1166 | field->duration, | 1165 | field->duration, |
1167 | field->outer_duration, | 1166 | field->outer_duration, |
1168 | field->timestamp.tv_sec, | 1167 | (long long)field->timestamp.tv_sec, |
1169 | field->timestamp.tv_nsec); | 1168 | field->timestamp.tv_nsec); |
1170 | 1169 | ||
1171 | if (field->nmi_count) { | 1170 | if (field->nmi_count) { |
@@ -1195,10 +1194,10 @@ trace_hwlat_raw(struct trace_iterator *iter, int flags, | |||
1195 | 1194 | ||
1196 | trace_assign_type(field, iter->ent); | 1195 | trace_assign_type(field, iter->ent); |
1197 | 1196 | ||
1198 | trace_seq_printf(s, "%llu %lld %ld %09ld %u\n", | 1197 | trace_seq_printf(s, "%llu %lld %lld %09ld %u\n", |
1199 | field->duration, | 1198 | field->duration, |
1200 | field->outer_duration, | 1199 | field->outer_duration, |
1201 | field->timestamp.tv_sec, | 1200 | (long long)field->timestamp.tv_sec, |
1202 | field->timestamp.tv_nsec, | 1201 | field->timestamp.tv_nsec, |
1203 | field->seqnum); | 1202 | field->seqnum); |
1204 | 1203 | ||