From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753995AbaE1A1m (ORCPT ); Tue, 27 May 2014 20:27:42 -0400 Received: from mail-yh0-f47.google.com ([209.85.213.47]:59034 "EHLO mail-yh0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753150AbaE1A1j (ORCPT ); Tue, 27 May 2014 20:27:39 -0400 From: Cody P Schafer To: LKML , Linux PPC , Arnaldo Carvalho de Melo , Ingo Molnar , Paul Mackerras , Peter Zijlstra Cc: Sukadev Bhattiprolu , Cody P Schafer Subject: [PATCH 10/16] perf: provide sysfs_show for struct perf_pmu_events_attr Date: Tue, 27 May 2014 17:22:05 -0700 Message-Id: <1401236684-10579-11-git-send-email-dev@codyps.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1401236684-10579-1-git-send-email-dev@codyps.com> References: <1401236684-10579-1-git-send-email-dev@codyps.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org (struct perf_pmu_events_attr) is defined in include/linux/perf_event.h, but the only "show" for it is in x86 and contains x86 specific stuff. Make a generic one for those of us who are just using the event_str. CC: Sukadev Bhattiprolu Signed-off-by: Cody P Schafer --- include/linux/perf_event.h | 3 +++ kernel/events/core.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 3356abc..6c1d6dd 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -867,6 +867,9 @@ struct perf_pmu_events_attr { const char *event_str; }; +ssize_t perf_event_sysfs_show(struct device *dev, struct device_attribute *attr, + char *page); + #define PMU_EVENT_ATTR(_name, _var, _id, _show) \ static struct perf_pmu_events_attr _var = { \ .attr = __ATTR(_name, 0444, _show, NULL), \ diff --git a/kernel/events/core.c b/kernel/events/core.c index f83a71a..6830e21 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -7971,6 +7971,14 @@ void __init perf_event_init(void) != 1024); } +ssize_t perf_event_sysfs_show(struct device *dev, struct device_attribute *attr, + char *page) +{ + struct perf_pmu_events_attr *pmu_attr = + container_of(attr, struct perf_pmu_events_attr, attr); + return sprintf(page, "%s\n", pmu_attr->event_str); +} + static int __init perf_event_sysfs_init(void) { struct pmu *pmu; -- 1.9.3