From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Mon, 7 Mar 2011 20:27:08 +0000 (+0100)
Subject: perf: Fix the software events state check
X-Git-Tag: v2.6.38.1~19
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=8ee8d7d4b511543c5368a23474d4cff231288ec3;p=unionfs-2.6.39.y.git

perf: Fix the software events state check

commit 91b2f482e62ad0d444222253026a5cbca28c4ab9 upstream.

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>
LKML-Reference: <1299529629-18280-1-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 656222fcf76..853705f6d29 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -4567,7 +4567,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))