[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-91b2f482e62ad0d444222253026a5cbca28c4ab9@git.kernel.org>
Date: Wed, 16 Mar 2011 13:58:29 GMT
From: tip-bot for Frederic Weisbecker <fweisbec@...il.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, eranian@...gle.com, paulus@...ba.org,
acme@...hat.com, hpa@...or.com, mingo@...hat.com,
a.p.zijlstra@...llo.nl, fweisbec@...il.com, stable@...nel.org,
tglx@...utronix.de, mingo@...e.hu
Subject: [tip:perf/urgent] perf: Fix the software events state check
Commit-ID: 91b2f482e62ad0d444222253026a5cbca28c4ab9
Gitweb: http://git.kernel.org/tip/91b2f482e62ad0d444222253026a5cbca28c4ab9
Author: Frederic Weisbecker <fweisbec@...il.com>
AuthorDate: Mon, 7 Mar 2011 21:27:08 +0100
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Wed, 16 Mar 2011 14:04:13 +0100
perf: Fix the software events state check
Fix the mistakenly inverted check of events state.
Signed-off-by: Frederic Weisbecker <fweisbec@...il.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: Arnaldo Carvalho de Melo <acme@...hat.com>
Cc: Paul Mackerras <paulus@...ba.org>
Cc: Stephane Eranian <eranian@...gle.com>
Cc: <stable@...nel.org>
LKML-Reference: <1299529629-18280-1-git-send-email-fweisbec@...il.com>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
kernel/perf_event.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index ed253aa..974e2e6 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))
--
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