From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932458Ab1CUXYA (ORCPT ); Mon, 21 Mar 2011 19:24:00 -0400 Received: from kroah.org ([198.145.64.141]:52764 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932393Ab1CUXSZ (ORCPT ); Mon, 21 Mar 2011 19:18:25 -0400 X-Mailbox-Line: From gregkh@clark.kroah.org Mon Mar 21 16:03:28 2011 Message-Id: <20110321230327.992323660@clark.kroah.org> User-Agent: quilt/0.48-16.4 Date: Mon, 21 Mar 2011 16:02:17 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Frederic Weisbecker , Arnaldo Carvalho de Melo , Paul Mackerras , Stephane Eranian , Peter Zijlstra , Ingo Molnar Subject: [61/78] perf: Handle stopped state with tracepoints In-Reply-To: <20110321230346.GA14681@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.38-stable review patch. If anyone has any objections, please let us know. ------------------ From: Frederic Weisbecker commit a0f7d0f7fc02465bb9758501f611f63381792996 upstream. We toggle the state from start and stop callbacks but actually don't check it when the event triggers. Do it so that these callbacks actually work. Signed-off-by: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <1299529629-18280-2-git-send-email-fweisbec@gmail.com> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- kernel/perf_event.c | 2 ++ 1 file changed, 2 insertions(+) --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -4923,6 +4923,8 @@ static int perf_tp_event_match(struct pe struct perf_sample_data *data, struct pt_regs *regs) { + if (event->hw.state & PERF_HES_STOPPED) + return 0; /* * All tracepoints are from kernel-space. */