diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-06-09 19:10:27 +0300 |
|---|---|---|
| committer | Xavier Boudet <x-boudet@ti.com> | 2013-01-03 14:15:56 +0100 |
| commit | cf4151b572cb448c3f6350f2614d646f3361715a (patch) | |
| tree | 35bf4a2140a63c13ce189034dc7c2ad4493874e6 /kernel | |
| parent | a06620b4702188f6e7068a150d568f6013cf7585 (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: 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 0fa92f677c92..100b7fd1a64b 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) |