Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Jiri Slaby <jslaby@suse.cz>,
	stable@vger.kernel.org, stable-commits@vger.kernel.org,
	Luis Henriques <luis.henriques@canonical.com>
Subject: Re: Patch "tracing: Have filter check for balanced ops" has been added to the 3.14-stable tree
Date: Wed, 24 Jun 2015 07:55:02 -0700	[thread overview]
Message-ID: <20150624145502.GD17352@kroah.com> (raw)
In-Reply-To: <20150623094059.269e8e6c@gandalf.local.home>

On Tue, Jun 23, 2015 at 09:40:59AM -0400, Steven Rostedt wrote:
> On Tue, 23 Jun 2015 15:22:50 +0200
> Jiri Slaby <jslaby@suse.cz> wrote:
> 
> 
> > > --- a/kernel/trace/trace_events_filter.c
> > > +++ b/kernel/trace/trace_events_filter.c
> > > @@ -1399,19 +1399,26 @@ static int check_preds(struct filter_par
> > >  {
> > >  	int n_normal_preds = 0, n_logical_preds = 0;
> > >  	struct postfix_elt *elt;
> > > +	int cnt = 0;
> > >  
> > >  	list_for_each_entry(elt, &ps->postfix, list) {
> > > -		if (elt->op == OP_NONE)
> > > +		if (elt->op == OP_NONE) {
> > > +			cnt++;
> > >  			continue;
> > > +		}
> > >  
> > >  		if (elt->op == OP_AND || elt->op == OP_OR) {
> > >  			n_logical_preds++;
> > > +			cnt--;
> > >  			continue;
> > >  		}
> > > +		if (elt->op != OP_NOT)
> > 
> > This breaks build, OP_NOT is not in 3.14 (or 3.10) yet. I dropped this
> > line for 3.12.
> 
> Luis has a version he used for his stable tree, which should also work
> for yours.
> 
> See this:
> 
>   http://lkml.kernel.org/r/20150622144940.GD2036@ares

Yes, now used, thanks.

greg k-h

      reply	other threads:[~2015-06-24 14:55 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-23  3:22 Patch "tracing: Have filter check for balanced ops" has been added to the 3.14-stable tree gregkh
2015-06-23 13:22 ` Jiri Slaby
2015-06-23 13:40   ` Steven Rostedt
2015-06-24 14:55     ` Greg KH [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150624145502.GD17352@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=jslaby@suse.cz \
    --cc=luis.henriques@canonical.com \
    --cc=rostedt@goodmis.org \
    --cc=stable-commits@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox