diff options
| author | Mark Salter <msalter@redhat.com> | 2016-09-14 17:32:29 -0500 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2016-09-16 17:11:33 +0100 |
| commit | dbee3a74ef2c73acc4eb31cee7a60d5e46767a41 (patch) | |
| tree | 5af9d2e063a0aa76b298bf2b834ed2447aca906a /drivers/perf | |
| parent | 55d5c4ab06e0c984aa38eae391f654f59b7d24db (diff) | |
| download | linux-stable-dbee3a74ef2c73acc4eb31cee7a60d5e46767a41.tar.gz linux-stable-dbee3a74ef2c73acc4eb31cee7a60d5e46767a41.tar.bz2 linux-stable-dbee3a74ef2c73acc4eb31cee7a60d5e46767a41.zip | |
arm64: pmu: add fallback probe table
In preparation for ACPI support, add a pmu_probe_info table to
the arm_pmu_device_probe() call. This table gets used when
probing in the absence of a devicetree node for PMU.
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index c36913ad3a09..77ac1ccb39ed 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -1048,7 +1048,7 @@ int arm_pmu_device_probe(struct platform_device *pdev, ret = of_pmu_irq_cfg(pmu); if (!ret) ret = init_fn(pmu); - } else { + } else if (probe_table) { cpumask_setall(&pmu->supported_cpus); ret = probe_current_pmu(pmu, probe_table); } |