From patchwork Thu Aug 26 19:09:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Fleming X-Patchwork-Id: 135721 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o7QJA75E016371 for ; Thu, 26 Aug 2010 19:10:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753897Ab0HZTJ0 (ORCPT ); Thu, 26 Aug 2010 15:09:26 -0400 Received: from arkanian.console-pimps.org ([212.110.184.194]:47525 "EHLO arkanian.console-pimps.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753557Ab0HZTJV (ORCPT ); Thu, 26 Aug 2010 15:09:21 -0400 Received: by arkanian.console-pimps.org (Postfix, from userid 1002) id 0D2C550E48; Thu, 26 Aug 2010 20:09:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on arkanian.vm.bytemark.co.uk X-Spam-Level: X-Spam-Status: No, score=-3.6 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.2.5 Received: from localhost (cpc5-brad6-0-0-cust25.barn.cable.virginmedia.com [82.38.64.26]) by arkanian.console-pimps.org (Postfix) with ESMTPSA id 9D9B050E3B; Thu, 26 Aug 2010 20:09:20 +0100 (BST) From: Matt Fleming To: linux-kernel@vger.kernel.org Cc: Robert Richter , Will Deacon , Paul Mundt , Russell King , linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org, Peter Zijlstra , Ingo Molnar , Frederic Weisbecker , Arnaldo Carvalho de Melo , linux-arch@vger.kernel.org Subject: [PATCH 2/4] sh: Accessor functions for the sh_pmu state Date: Thu, 26 Aug 2010 20:09:17 +0100 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 26 Aug 2010 19:10:07 +0000 (UTC) diff --git a/arch/sh/include/asm/perf_event.h b/arch/sh/include/asm/perf_event.h index 3d0c9f3..5b7fa84 100644 --- a/arch/sh/include/asm/perf_event.h +++ b/arch/sh/include/asm/perf_event.h @@ -25,6 +25,8 @@ struct sh_pmu { extern int register_sh_pmu(struct sh_pmu *); extern int reserve_pmc_hardware(void); extern void release_pmc_hardware(void); +extern int sh_pmu_num_events(void); +extern const char *sh_pmu_name(void); static inline void set_perf_event_pending(void) { diff --git a/arch/sh/kernel/perf_event.c b/arch/sh/kernel/perf_event.c index 7a3dc35..086f788 100644 --- a/arch/sh/kernel/perf_event.c +++ b/arch/sh/kernel/perf_event.c @@ -60,6 +60,19 @@ static inline int sh_pmu_initialized(void) } /* + * Return the number of events for the current sh_pmu. + */ +int sh_pmu_num_events(void) +{ + return sh_pmu->num_events; +} + +const char *sh_pmu_name(void) +{ + return sh_pmu->name; +} + +/* * Release the PMU if this is the last perf_event. */ static void hw_perf_event_destroy(struct perf_event *event)