Commit 037e79aa authored May 21, 2014 by Mark Rutland Committed by Will Deacon Jul 02, 2014

arm: perf: krait: stop using singleton PMU



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.

Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>
Tested-by: Christopher Covington <cov@codeaurora.org>
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

parent 253d8c3d

arch/arm/kernel/perf_event_v7.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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();

		/*