From 84607a3a1e5505f358e2a0b3a2e4e7a8ba497db2 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Mon, 20 Feb 2012 20:37:32 -0500 Subject: [PATCH] --- yaml --- r: 288686 b: refs/heads/master c: 5b34926114e39e12005031269613d2b13194aeba h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_output.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8bf1c4592a8e..337baeccf5c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e404b321dbb2d6e438522b7dce9c1d0c6a8c5275 +refs/heads/master: 5b34926114e39e12005031269613d2b13194aeba diff --git a/trunk/kernel/trace/trace_output.c b/trunk/kernel/trace/trace_output.c index 3efd718984fb..c5a01873567d 100644 --- a/trunk/kernel/trace/trace_output.c +++ b/trunk/kernel/trace/trace_output.c @@ -319,7 +319,7 @@ ftrace_print_flags_seq(struct trace_seq *p, const char *delim, /* check for left over flags */ if (flags) { - if (p->len && delim) + if (!first && delim) trace_seq_puts(p, delim); trace_seq_printf(p, "0x%lx", flags); } @@ -346,7 +346,7 @@ ftrace_print_symbols_seq(struct trace_seq *p, unsigned long val, break; } - if (!p->len) + if (ret == (const char *)(p->buffer + p->len)) trace_seq_printf(p, "0x%lx", val); trace_seq_putc(p, 0); @@ -372,7 +372,7 @@ ftrace_print_symbols_seq_u64(struct trace_seq *p, unsigned long long val, break; } - if (!p->len) + if (ret == (const char *)(p->buffer + p->len)) trace_seq_printf(p, "0x%llx", val); trace_seq_putc(p, 0);