[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <1354245042.6276.135.camel@gandalf.local.home>
Date: Thu, 29 Nov 2012 22:10:42 -0500
From: Steven Rostedt <rostedt@...dmis.org>
To: LKML <linux-kernel@...r.kernel.org>
Cc: Ingo Molnar <mingo@...nel.org>,
Andrew Morton <akpm@...ux-foundation.org>,
stable <stable@...r.kernel.org>,
Dan Carpenter <dan.carpenter@...cle.com>
Subject: Re: [PATCH][GIT PULL] ftrace: Clear bits properly in
reset_iter_read()
On Fri, 2012-11-16 at 08:22 -0500, Steven Rostedt wrote:
> Ingo,
Ping?
-- Steve
>
> Please pull the latest tip/perf/urgent tree, which can be found at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
> tip/perf/urgent
>
> Head SHA1: 70f77b3f7ec010ff9624c1f2e39a81babc9e2429
>
>
> Dan Carpenter (1):
> ftrace: Clear bits properly in reset_iter_read()
>
> ----
> kernel/trace/ftrace.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> ---------------------------
> commit 70f77b3f7ec010ff9624c1f2e39a81babc9e2429
> Author: Dan Carpenter <dan.carpenter@...cle.com>
> Date: Sat Jun 9 19:10:27 2012 +0300
>
> 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@...r.kernel.org # all of them
> Signed-off-by: Dan Carpenter <dan.carpenter@...cle.com>
> Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
>
> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index 9dcf15d..51b7159 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)
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists