diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-15 11:44:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-15 11:44:32 -0800 |
| commit | e8bdb3c8be08c9a3edc0a373c0aa8729355a0705 (patch) | |
| tree | f9420586c9b636afe2fb7258a683584e07b50c6e | |
| parent | f868cd2517763c66783c6000b29d97f0b966b311 (diff) | |
| parent | 57f7c7dc78cd09622b12920d92b40c1ce11b234e (diff) | |
| download | linux-e8bdb3c8be08c9a3edc0a373c0aa8729355a0705.tar.gz linux-e8bdb3c8be08c9a3edc0a373c0aa8729355a0705.tar.bz2 linux-e8bdb3c8be08c9a3edc0a373c0aa8729355a0705.zip | |
Merge tag 'riscv-for-linus-6.12-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linuxHEADmaster
Pull RISC-V fix from Palmer Dabbelt:
- A fix for the CPU perf driver that avoids leaking CPU ID references
on systems without snapshot support.
* tag 'riscv-for-linus-6.12-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
drivers: perf: Fix wrong put_cpu() placement
| -rw-r--r-- | drivers/perf/riscv_pmu_sbi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c index 391ca1422cae..1aa303f76cc7 100644 --- a/drivers/perf/riscv_pmu_sbi.c +++ b/drivers/perf/riscv_pmu_sbi.c @@ -1393,8 +1393,9 @@ static int pmu_sbi_device_probe(struct platform_device *pdev) goto out_unregister; cpu = get_cpu(); - ret = pmu_sbi_snapshot_setup(pmu, cpu); + put_cpu(); + if (ret) { /* Snapshot is an optional feature. Continue if not available */ pmu_sbi_snapshot_free(pmu); @@ -1408,7 +1409,6 @@ static int pmu_sbi_device_probe(struct platform_device *pdev) */ static_branch_enable(&sbi_pmu_snapshot_available); } - put_cpu(); } register_sysctl("kernel", sbi_pmu_sysctl_table); |