From patchwork Wed May 28 00:22:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cody P Schafer X-Patchwork-Id: 353214 X-Patchwork-Delegate: michael@ellerman.id.au Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5F6D81400DB for ; Wed, 28 May 2014 12:19:17 +1000 (EST) Received: from ozlabs.org (ozlabs.org [103.22.144.67]) by lists.ozlabs.org (Postfix) with ESMTP id 4324E1A1242 for ; Wed, 28 May 2014 12:19:17 +1000 (EST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-yk0-x22a.google.com (mail-yk0-x22a.google.com [IPv6:2607:f8b0:4002:c07::22a]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 64FB41A0591 for ; Wed, 28 May 2014 10:27:42 +1000 (EST) Received: by mail-yk0-f170.google.com with SMTP id 10so7844417ykt.1 for ; Tue, 27 May 2014 17:27:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codyps.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wSoxzxEZoiRWwV/01Y3tFdGPS8zdWwOcMu/8JuOSlMQ=; b=FDZTCtde9n0Y6R0KidabVP2gqLBRPxSFsJnuvTYKhScMNQmPA+jqe/J5ny72GfE8kN fsfSxNBvoGEhtuMRfRKmEBPnqO7Fi9f+TU2IiVe5gmtz6QmdiOxY7afm7/Ge+H9dFZu2 2ztUdklgBfOpYSqa9sQ/BY0aDQuoT023HSYRw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wSoxzxEZoiRWwV/01Y3tFdGPS8zdWwOcMu/8JuOSlMQ=; b=RQxfzl/rKLQNkpU/aTEUxTNb+dvcd4MKbF4QQyov/dwe/HbzE+PIJVx5BYU5/Z50EK Hq2ASsBOcYMh8xzKdcnkvf3cLfTDFUjRhJiFAVlehEEGPF4eyZL91H1Xa7Wn0HhTeLCQ 37nruQyBKyHhNOxKzQovvEmLKInYObY/7ghldtMszkg18tm/VKaazDyw0d2i0UW89ejZ 9EQ4MvwuJjr2X+ko3HkfzBne1MSfPwprogIx5S0KEfZtl9Q0sfX4Sg2mXqtonKbpa4lu UdW+BLBDQLUDuqdpch3yVO+VxSUIOkmUppxa+LwhXGRHJ1MGw2GrWKYVpazgUvM2sSxu 4ZcQ== X-Gm-Message-State: ALoCoQnOBzBpIzMovi8WGAzwnZyS9jnn23ruUCn7PFmwlDBZtGPLYixmJkLcjpNF59oHVrJiwf+r X-Received: by 10.236.192.73 with SMTP id h49mr51460780yhn.6.1401236859322; Tue, 27 May 2014 17:27:39 -0700 (PDT) Received: from localhost ([32.97.110.54]) by mx.google.com with ESMTPSA id g1sm25151832yho.37.2014.05.27.17.27.36 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 27 May 2014 17:27:38 -0700 (PDT) From: Cody P Schafer To: LKML , Linux PPC , Arnaldo Carvalho de Melo , Ingo Molnar , Paul Mackerras , Peter Zijlstra 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> X-Mailman-Approved-At: Wed, 28 May 2014 12:12:11 +1000 Cc: Sukadev Bhattiprolu , Cody P Schafer X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" (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;