lkml.org 
[lkml]   [2013]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 030/222] ftrace: Clear bits properly in reset_iter_read()
    Date
    3.5.7.3 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dan Carpenter <dan.carpenter@oracle.com>

    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: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    ---
    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 a008663..97da2dc 100644
    --- a/kernel/trace/ftrace.c
    +++ b/kernel/trace/ftrace.c
    @@ -2358,7 +2358,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)
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2013-01-16 20:23    [W:4.057 / U:23.596 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site