diff options
author | Steven Rostedt <rostedt@goodmis.org> | 2008-09-03 17:42:50 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-14 04:36:39 -0400 |
commit | 652567aa2000f1d4a1fd434382a30d8dd4a7c980 (patch) | |
tree | 0686a5ceeeb9f6ecedf5d063d05563ac32359554 /kernel/trace/trace.c | |
parent | a6168353d1c0b24b7512e14d1c3e47ed69881a23 (diff) |
ftrace: binary and not logical for continue test
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>
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 1801900908e1..9639e45f0860 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -1655,7 +1655,7 @@ print_lat_fmt(struct trace_iterator *iter, unsigned int trace_idx, int cpu) | |||
1655 | case TRACE_PRINT: | 1655 | case TRACE_PRINT: |
1656 | seq_print_ip_sym(s, field->print.ip, sym_flags); | 1656 | seq_print_ip_sym(s, field->print.ip, sym_flags); |
1657 | trace_seq_printf(s, ": %s", field->print.buf); | 1657 | trace_seq_printf(s, ": %s", field->print.buf); |
1658 | if (field->flags && TRACE_FLAG_CONT) | 1658 | if (field->flags & TRACE_FLAG_CONT) |
1659 | trace_seq_print_cont(s, iter); | 1659 | trace_seq_print_cont(s, iter); |
1660 | break; | 1660 | break; |
1661 | default: | 1661 | default: |
@@ -1768,7 +1768,7 @@ static int print_trace_fmt(struct trace_iterator *iter) | |||
1768 | case TRACE_PRINT: | 1768 | case TRACE_PRINT: |
1769 | seq_print_ip_sym(s, field->print.ip, sym_flags); | 1769 | seq_print_ip_sym(s, field->print.ip, sym_flags); |
1770 | trace_seq_printf(s, ": %s", field->print.buf); | 1770 | trace_seq_printf(s, ": %s", field->print.buf); |
1771 | if (field->flags && TRACE_FLAG_CONT) | 1771 | if (field->flags & TRACE_FLAG_CONT) |
1772 | trace_seq_print_cont(s, iter); | 1772 | trace_seq_print_cont(s, iter); |
1773 | break; | 1773 | break; |
1774 | } | 1774 | } |
@@ -1833,7 +1833,7 @@ static int print_raw_fmt(struct trace_iterator *iter) | |||
1833 | case TRACE_PRINT: | 1833 | case TRACE_PRINT: |
1834 | trace_seq_printf(s, "# %lx %s", | 1834 | trace_seq_printf(s, "# %lx %s", |
1835 | field->print.ip, field->print.buf); | 1835 | field->print.ip, field->print.buf); |
1836 | if (field->flags && TRACE_FLAG_CONT) | 1836 | if (field->flags & TRACE_FLAG_CONT) |
1837 | trace_seq_print_cont(s, iter); | 1837 | trace_seq_print_cont(s, iter); |
1838 | break; | 1838 | break; |
1839 | } | 1839 | } |