Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-03-24 08:01:34 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-24 08:01:34 -0700
commit2ce87b8698884ec9367b0913037808f07fb5e4bd (patch)
tree5ff4fa8d92720612581bfa3bf484f626471e1527
parentda1785bfc8e5e84b51f396d9a5c31d4b5d5b22f6 (diff)
Revert "perf: Handle stopped state with tracepoints"
This reverts commit 6f197b73304b3bd3d5a43b931383a5331d6b2987, which was originally commit a0f7d0f7fc02465bb9758501f611f63381792996 upstream. This breaks the build, thanks to Jiri Slaby for pointing this out. Reported-by: Jiri Slaby <jslaby@suse.cz> Cc: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--kernel/perf_event.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index f9af60f30adf..183d437f4a0f 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -4167,8 +4167,6 @@ static void tp_perf_event_destroy(struct perf_event *event)
static const struct pmu *tp_perf_event_init(struct perf_event *event)
{
- if (event->hw.state & PERF_HES_STOPPED)
- return 0;
/*
* Raw tracepoint data is a severe data leak, only allow root to
* have these.