Commit 70f77b3f authored Jun 09, 2012 by Dan Carpenter Committed by Steven Rostedt Nov 15, 2012

ftrace: Clear bits properly in reset_iter_read()

There is a typo here where '&' is used instead of '|' and it turns the
statement into a noop.  The original code is equivalent to:

	iter->flags &= ~((1 << 2) & (1 << 4));

Link: http://lkml.kernel.org/r/20120609161027.GD6488@elgon.mountain



Cc: stable@vger.kernel.org # all of them
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

parent 18423d35

kernel/trace/ftrace.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2437,7 +2437,7 @@ static void reset_iter_read(struct ftrace_iterator *iter)
		{
		iter->pos = 0;
		iter->func_pos = 0;
		iter->flags &= ~(FTRACE_ITER_PRINTALL & FTRACE_ITER_HASH);
		iter->flags &= ~(FTRACE_ITER_PRINTALL \| FTRACE_ITER_HASH);
		}

		static void t_start(struct seq_file m, loff_t *pos)

Admin message