public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Arnaldo Carvalho de Melo <acme@infradead.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Dan Carpenter <error27@gmail.com>
Subject: [PATCH][GIT PULL] perf: Fix check at end of event search
Date: Thu, 06 May 2010 23:09:27 -0400	[thread overview]
Message-ID: <1273201767.22438.73.camel@gandalf.stny.rr.com> (raw)


Ingo,

I just notice that I had this patch laying around and never pushed it
out. I first had it in my ftrace branches but then realized that it was
a perf change. I moved it there, but got distracted and unfortunately,
forgot about it. I rebased it to the latest tip/perf/core.

The change is within a #ifdef CONFIG_PERF_EVENTS

Please pull the latest tip/perf/core tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/perf/core


Dan Carpenter (1):
      perf: Fix check at end of event search

----
 kernel/trace/trace_events_filter.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---------------------------
commit d9f599e1e6d019968b35d2dc63074b9e8964fa69
Author: Dan Carpenter <error27@gmail.com>
Date:   Sat Mar 20 17:39:11 2010 +0300

    perf: Fix check at end of event search
    
    The original code doesn't work because "call" is never NULL there.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    LKML-Reference: <20100320143911.GF5331@bicker>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index 88c0b6d..58092d8 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -1398,7 +1398,7 @@ int ftrace_profile_set_filter(struct perf_event *event, int event_id,
 	}
 
 	err = -EINVAL;
-	if (!call)
+	if (&call->list == &ftrace_events)
 		goto out_unlock;
 
 	err = -EEXIST;



             reply	other threads:[~2010-05-07  3:09 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-07  3:09 Steven Rostedt [this message]
2010-05-07  6:29 ` [PATCH][GIT PULL] perf: Fix check at end of event search Ingo Molnar

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=1273201767.22438.73.camel@gandalf.stny.rr.com \
    --to=rostedt@goodmis.org \
    --cc=acme@infradead.org \
    --cc=error27@gmail.com \
    --cc=fweisbec@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=peterz@infradead.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