summaryrefslogtreecommitdiffstats
path: root/kernel/perf_event.c
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2011-03-07 21:27:08 +0100
committerIngo Molnar <mingo@elte.hu>2011-03-16 14:04:13 +0100
commit91b2f482e62ad0d444222253026a5cbca28c4ab9 (patch)
tree4ce0c4bd27c85182481e5330033de2546e322873 /kernel/perf_event.c
parent0837e3242c73566fc1c0196b4ec61779c25ffc93 (diff)
downloadlinux-stable-91b2f482e62ad0d444222253026a5cbca28c4ab9.tar.gz
linux-stable-91b2f482e62ad0d444222253026a5cbca28c4ab9.tar.bz2
linux-stable-91b2f482e62ad0d444222253026a5cbca28c4ab9.zip
perf: Fix the software events state check
Fix the mistakenly inverted check of events state. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Stephane Eranian <eranian@google.com> Cc: <stable@kernel.org> LKML-Reference: <1299529629-18280-1-git-send-email-fweisbec@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/perf_event.c')
-rw-r--r--kernel/perf_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index ed253aa24ba4..974e2e64a43a 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -5122,7 +5122,7 @@ static int perf_exclude_event(struct perf_event *event,
struct pt_regs *regs)
{
if (event->hw.state & PERF_HES_STOPPED)
- return 0;
+ return 1;
if (regs) {
if (event->attr.exclude_user && user_mode(regs))