summaryrefslogtreecommitdiffstats
path: root/drivers/perf
diff options
context:
space:
mode:
authorMark Salter <msalter@redhat.com>2016-06-07 11:32:21 -0500
committerWill Deacon <will.deacon@arm.com>2016-06-15 09:51:35 +0100
commitf7a6c1492a2cb596952260a7d5bb0d61ca815173 (patch)
tree966c8e457ba6986a2fa9a23119511f6fe626c9b8 /drivers/perf
parentbbb1681ee3653bdcfc6a4ba31902738118311fd4 (diff)
downloadop-kernel-dev-f7a6c1492a2cb596952260a7d5bb0d61ca815173.zip
op-kernel-dev-f7a6c1492a2cb596952260a7d5bb0d61ca815173.tar.gz
arm: pmu: Fix non-devicetree probing
There is a problem in the non-devicetree PMU probing where some probe functions may get the number of supported events through smp_call_function_any() using the arm_pmu supported_cpus mask. But at the time the probe function is called, the supported_cpus mask is empty so the call fails. This patch makes sure the mask is set before calling the init function rather than after. Signed-off-by: Mark Salter <msalter@redhat.com> Signed-off-by: Jeremy Linton <jeremy.linton@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/perf')
-rw-r--r--drivers/perf/arm_pmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c
index 1b8304e..140436a 100644
--- a/drivers/perf/arm_pmu.c
+++ b/drivers/perf/arm_pmu.c
@@ -1010,8 +1010,8 @@ int arm_pmu_device_probe(struct platform_device *pdev,
if (!ret)
ret = init_fn(pmu);
} else {
- ret = probe_current_pmu(pmu, probe_table);
cpumask_setall(&pmu->supported_cpus);
+ ret = probe_current_pmu(pmu, probe_table);
}
if (ret) {
OpenPOWER on IntegriCloud