aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/trace/trace_output.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 3efd718984fb..c5a01873567d 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -319,7 +319,7 @@ ftrace_print_flags_seq(struct trace_seq *p, const char *delim,
319 319
320 /* check for left over flags */ 320 /* check for left over flags */
321 if (flags) { 321 if (flags) {
322 if (p->len && delim) 322 if (!first && delim)
323 trace_seq_puts(p, delim); 323 trace_seq_puts(p, delim);
324 trace_seq_printf(p, "0x%lx", flags); 324 trace_seq_printf(p, "0x%lx", flags);
325 } 325 }
@@ -346,7 +346,7 @@ ftrace_print_symbols_seq(struct trace_seq *p, unsigned long val,
346 break; 346 break;
347 } 347 }
348 348
349 if (!p->len) 349 if (ret == (const char *)(p->buffer + p->len))
350 trace_seq_printf(p, "0x%lx", val); 350 trace_seq_printf(p, "0x%lx", val);
351 351
352 trace_seq_putc(p, 0); 352 trace_seq_putc(p, 0);
@@ -372,7 +372,7 @@ ftrace_print_symbols_seq_u64(struct trace_seq *p, unsigned long long val,
372 break; 372 break;
373 } 373 }
374 374
375 if (!p->len) 375 if (ret == (const char *)(p->buffer + p->len))
376 trace_seq_printf(p, "0x%llx", val); 376 trace_seq_printf(p, "0x%llx", val);
377 377
378 trace_seq_putc(p, 0); 378 trace_seq_putc(p, 0);