Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 652567aa authored by Steven Rostedt's avatar Steven Rostedt Committed by Ingo Molnar
Browse files

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: default avatarSteven Rostedt <srostedt@redhat.com>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a6168353

kernel/trace/trace.c

+3 −3
Original line number Diff line number Diff line
@@ -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:
@@ -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;

	}
@@ -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;

	}