diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2014-02-07 21:01:20 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2014-02-21 11:10:52 +0000 |
| commit | 3a3967ed9135f931f3848b0c946dcf3c10ca9f9a (patch) | |
| tree | b358c1ff9179d9e2eac6bd4bd47517e05b4a510a /arch/arm/kernel | |
| parent | bbd64559376fa25732994c4181c8ec493fa57871 (diff) | |
| download | blackbird-op-linux-3a3967ed9135f931f3848b0c946dcf3c10ca9f9a.tar.gz blackbird-op-linux-3a3967ed9135f931f3848b0c946dcf3c10ca9f9a.zip | |
ARM: perf: assign pdev pointer earlier for CPU PMUs
We want to inspect the of_node that the pdev is pointing to in
the Krait CPU specific PMU initialization function. Assign it
earlier so that we don't crash with a NULL pointer dereference.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/perf_event_cpu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/kernel/perf_event_cpu.c b/arch/arm/kernel/perf_event_cpu.c index 6efd8aab15df..68d02ca0ca1b 100644 --- a/arch/arm/kernel/perf_event_cpu.c +++ b/arch/arm/kernel/perf_event_cpu.c @@ -311,6 +311,9 @@ static int cpu_pmu_device_probe(struct platform_device *pdev) return -ENOMEM; } + cpu_pmu = pmu; + cpu_pmu->plat_device = pdev; + if (node && (of_id = of_match_node(cpu_pmu_of_device_ids, pdev->dev.of_node))) { init_fn = of_id->data; ret = init_fn(pmu); @@ -323,8 +326,6 @@ static int cpu_pmu_device_probe(struct platform_device *pdev) goto out_free; } - cpu_pmu = pmu; - cpu_pmu->plat_device = pdev; cpu_pmu_init(cpu_pmu); ret = armpmu_register(cpu_pmu, PERF_TYPE_RAW); |
