diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-06-09 19:10:27 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-01-03 03:33:10 +0000 |
| commit | 2da23000e780bb0b1f8cb03fb523bcba9b4a3374 (patch) | |
| tree | 12f9f91713c30c945eefcd7601f86e6287f2a70d /kernel | |
| parent | 30ed82e80cfd672fce2e09a1fe64e89ab0cb05f5 (diff) | |
ftrace: Clear bits properly in reset_iter_read()
commit 70f77b3f7ec010ff9624c1f2e39a81babc9e2429 upstream.
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
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'kernel')
| -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 25b4f4da0fe8..54dba590c211 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -2074,7 +2074,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) |