Messages in this thread Patch in this message | | | Date | Sun, 9 Dec 2012 03:30:45 -0800 | From | tip-bot for Dan Carpenter <> | Subject | [tip:perf/urgent] ftrace: Clear bits properly in reset_iter_read( ) |
| |
Commit-ID: 70f77b3f7ec010ff9624c1f2e39a81babc9e2429 Gitweb: http://git.kernel.org/tip/70f77b3f7ec010ff9624c1f2e39a81babc9e2429 Author: Dan Carpenter <dan.carpenter@oracle.com> AuthorDate: Sat, 9 Jun 2012 19:10:27 +0300 Committer: Steven Rostedt <rostedt@goodmis.org> CommitDate: Thu, 15 Nov 2012 16:10:17 -0500
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> --- kernel/trace/ftrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 9dcf15d..51b7159 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -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)
| |