diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-06-09 19:10:27 +0300 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-11-15 16:10:17 -0500 |
| commit | 70f77b3f7ec010ff9624c1f2e39a81babc9e2429 (patch) | |
| tree | a47ad8d3c846b8418919a2cfdfbf6424ff041767 /kernel/trace | |
| parent | 18423d3562f396206e0928a71177eeb2edfed077 (diff) | |
| download | linux-70f77b3f7ec010ff9624c1f2e39a81babc9e2429.tar.gz linux-70f77b3f7ec010ff9624c1f2e39a81babc9e2429.tar.bz2 linux-70f77b3f7ec010ff9624c1f2e39a81babc9e2429.zip | |
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>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/ftrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 9dcf15d38380..51b71594f321 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) |