[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1273201767.22438.73.camel@gandalf.stny.rr.com>
Date: Thu, 06 May 2010 23:09:27 -0400
From: Steven Rostedt <rostedt@...dmis.org>
To: LKML <linux-kernel@...r.kernel.org>
Cc: Ingo Molnar <mingo@...e.hu>,
Frederic Weisbecker <fweisbec@...il.com>,
Arnaldo Carvalho de Melo <acme@...radead.org>,
Peter Zijlstra <peterz@...radead.org>,
Dan Carpenter <error27@...il.com>
Subject: [PATCH][GIT PULL] perf: Fix check at end of event search
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@...il.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@...il.com>
LKML-Reference: <20100320143911.GF5331@...ker>
Signed-off-by: Steven Rostedt <rostedt@...dmis.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;
--
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