From: mark.rutland@arm.com (Mark Rutland)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 8/8] arm: perf: krait: stop using singleton PMU
Date: Tue, 1 Jul 2014 16:11:18 +0100 [thread overview]
Message-ID: <1404227478-9645-9-git-send-email-mark.rutland@arm.com> (raw)
In-Reply-To: <1404227478-9645-1-git-send-email-mark.rutland@arm.com>
Currently the krait_pmu_{enable,disable}_event functions use the global
cpu_pmu variable while all the other pmu enable/disable functions
derive this from the event argument.
This patch brings the Krait functions into line with the rest of the PMU
backends by deriving the address of the pmu from the event argument.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
---
arch/arm/kernel/perf_event_v7.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/kernel/perf_event_v7.c b/arch/arm/kernel/perf_event_v7.c
index d4129bc..116758b 100644
--- a/arch/arm/kernel/perf_event_v7.c
+++ b/arch/arm/kernel/perf_event_v7.c
@@ -1286,6 +1286,7 @@ static void krait_pmu_disable_event(struct perf_event *event)
unsigned long flags;
struct hw_perf_event *hwc = &event->hw;
int idx = hwc->idx;
+ struct arm_pmu *cpu_pmu = to_arm_pmu(event->pmu);
struct pmu_hw_events *events = cpu_pmu->get_hw_events();
/* Disable counter and interrupt */
@@ -1311,6 +1312,7 @@ static void krait_pmu_enable_event(struct perf_event *event)
unsigned long flags;
struct hw_perf_event *hwc = &event->hw;
int idx = hwc->idx;
+ struct arm_pmu *cpu_pmu = to_arm_pmu(event->pmu);
struct pmu_hw_events *events = cpu_pmu->get_hw_events();
/*
--
1.9.1
next prev parent reply other threads:[~2014-07-01 15:11 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-01 15:11 [PATCH 0/8] arm: perf: cleanups and initial refactoring Mark Rutland
2014-07-01 15:11 ` [PATCH 1/8] arm: perf: move event map macros to pmu.h Mark Rutland
2014-07-01 15:11 ` [PATCH 2/8] arm: perf: add macros for empty event mappings Mark Rutland
2014-07-01 15:11 ` [PATCH 3/8] arm: perf: armv7: condense event maps Mark Rutland
2014-07-01 15:11 ` [PATCH 4/8] arm: perf: armv6: " Mark Rutland
2014-07-01 15:11 ` [PATCH 5/8] arm: perf: xscale: " Mark Rutland
2014-07-01 15:11 ` [PATCH 6/8] arm: perf: clean up PMU names Mark Rutland
2014-07-01 15:11 ` [PATCH 7/8] arm: perf: add more specific platform device IDs Mark Rutland
2014-07-01 18:06 ` Will Deacon
2014-07-01 15:11 ` Mark Rutland [this message]
2014-07-01 17:40 ` [PATCH 8/8] arm: perf: krait: stop using singleton PMU Stephen Boyd
2014-07-01 18:06 ` Will Deacon
2014-07-02 12:46 ` [PATCH 0/8] arm: perf: cleanups and initial refactoring Christopher Covington
2014-07-02 14:45 ` Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1404227478-9645-9-git-send-email-mark.rutland@arm.com \
--to=mark.rutland@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).