Skip to content

Commit

Permalink
ftrace: binary and not logical for continue test
Browse files Browse the repository at this point in the history
Peter Zijlstra provided me with a nice brown paper bag while letting me know
that I was doing a logical AND and not a binary one, making a condition
true more often than it should be.

Luckily, a false true is handled by the calling function and no harm is
done. But this needs to be fixed regardless.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Steven Rostedt authored and Ingo Molnar committed Oct 14, 2008
1 parent a616835 commit 652567a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions kernel/trace/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -1655,7 +1655,7 @@ print_lat_fmt(struct trace_iterator *iter, unsigned int trace_idx, int cpu)
case TRACE_PRINT:
seq_print_ip_sym(s, field->print.ip, sym_flags);
trace_seq_printf(s, ": %s", field->print.buf);
if (field->flags && TRACE_FLAG_CONT)
if (field->flags & TRACE_FLAG_CONT)
trace_seq_print_cont(s, iter);
break;
default:
Expand Down Expand Up @@ -1768,7 +1768,7 @@ static int print_trace_fmt(struct trace_iterator *iter)
case TRACE_PRINT:
seq_print_ip_sym(s, field->print.ip, sym_flags);
trace_seq_printf(s, ": %s", field->print.buf);
if (field->flags && TRACE_FLAG_CONT)
if (field->flags & TRACE_FLAG_CONT)
trace_seq_print_cont(s, iter);
break;
}
Expand Down Expand Up @@ -1833,7 +1833,7 @@ static int print_raw_fmt(struct trace_iterator *iter)
case TRACE_PRINT:
trace_seq_printf(s, "# %lx %s",
field->print.ip, field->print.buf);
if (field->flags && TRACE_FLAG_CONT)
if (field->flags & TRACE_FLAG_CONT)
trace_seq_print_cont(s, iter);
break;
}
Expand Down

0 comments on commit 652567a

Please sign in to comment.