ftrace: Clear bits properly in reset_iter_read()
authorDan Carpenter <dan.carpenter@oracle.com>
Sat, 9 Jun 2012 16:10:27 +0000 (19:10 +0300)
committerSteven Rostedt <rostedt@goodmis.org>
Thu, 15 Nov 2012 21:10:17 +0000 (16:10 -0500)
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>
kernel/trace/ftrace.c

index 9dcf15d38380356a2288ec97b098c002d9bca01d..51b71594f321cd6d402bb5444f87c9b75e46335f 100644 (file)
@@ -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)