diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-06-09 19:10:27 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-17 10:37:46 -0800 |
| commit | 455d8953951baf0d38673b010100241e508b765c (patch) | |
| tree | 094cf118760740e10acdef2f4edffd425e5a86f4 /kernel | |
| parent | 31fdb19eb968995b3c5f4337918bd51442f992ec (diff) | |
| download | linux-3.10-455d8953951baf0d38673b010100241e508b765c.tar.gz linux-3.10-455d8953951baf0d38673b010100241e508b765c.tar.bz2 linux-3.10-455d8953951baf0d38673b010100241e508b765c.zip | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 0fa92f677c9..100b7fd1a64 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -2368,7 +2368,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) |