diff options
Diffstat (limited to 'kernel/trace/trace_mmiotrace.c')
-rw-r--r-- | kernel/trace/trace_mmiotrace.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c index 23e346a734ca..f095916e477f 100644 --- a/kernel/trace/trace_mmiotrace.c +++ b/kernel/trace/trace_mmiotrace.c | |||
@@ -254,6 +254,7 @@ static enum print_line_t mmio_print_mark(struct trace_iterator *iter) | |||
254 | { | 254 | { |
255 | struct trace_entry *entry = iter->ent; | 255 | struct trace_entry *entry = iter->ent; |
256 | struct print_entry *print = (struct print_entry *)entry; | 256 | struct print_entry *print = (struct print_entry *)entry; |
257 | const char *msg = print->buf; | ||
257 | struct trace_seq *s = &iter->seq; | 258 | struct trace_seq *s = &iter->seq; |
258 | unsigned long long t = ns2usecs(iter->ts); | 259 | unsigned long long t = ns2usecs(iter->ts); |
259 | unsigned long usec_rem = do_div(t, USEC_PER_SEC); | 260 | unsigned long usec_rem = do_div(t, USEC_PER_SEC); |
@@ -261,11 +262,7 @@ static enum print_line_t mmio_print_mark(struct trace_iterator *iter) | |||
261 | int ret; | 262 | int ret; |
262 | 263 | ||
263 | /* The trailing newline must be in the message. */ | 264 | /* The trailing newline must be in the message. */ |
264 | ret = trace_seq_printf(s, "MARK %u.%06lu ", secs, usec_rem); | 265 | ret = trace_seq_printf(s, "MARK %u.%06lu %s", secs, usec_rem, msg); |
265 | if (!ret) | ||
266 | return TRACE_TYPE_PARTIAL_LINE; | ||
267 | |||
268 | ret = trace_seq_bprintf(s, print->fmt, print->buf); | ||
269 | if (!ret) | 266 | if (!ret) |
270 | return TRACE_TYPE_PARTIAL_LINE; | 267 | return TRACE_TYPE_PARTIAL_LINE; |
271 | 268 | ||