diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-19 13:49:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-19 13:49:07 -0700 |
| commit | 8fd00059cc13c7f170451e9318a9a5e772b88e17 (patch) | |
| tree | a627675f2ea59cc5893a267a9a1251aa667cf1ec /drivers | |
| parent | ca052cfd6ee5d3358f2929439e0c7f0424bedc9e (diff) | |
| parent | 96264230a6817bcd4a7ae0fc30c60bfb46499f68 (diff) | |
| download | linux-8fd00059cc13c7f170451e9318a9a5e772b88e17.tar.bz2 | |
Merge tag 'riscv-for-linus-6.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V fixes from Palmer Dabbelt:
- A fix to make the ISA extension static keys writable after init. This
manifests at least as a crash when loading modules (including KVM).
- A fixup for a build warning related to a poorly formed comment in our
perf driver.
* tag 'riscv-for-linus-6.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
perf: riscv legacy: fix kerneldoc comment warning
riscv: Ensure isa-ext static keys are writable
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/perf/riscv_pmu_legacy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/perf/riscv_pmu_legacy.c b/drivers/perf/riscv_pmu_legacy.c index 342778782359..2c20b0de8cb0 100644 --- a/drivers/perf/riscv_pmu_legacy.c +++ b/drivers/perf/riscv_pmu_legacy.c @@ -72,7 +72,7 @@ static void pmu_legacy_ctr_start(struct perf_event *event, u64 ival) local64_set(&hwc->prev_count, initial_val); } -/** +/* * This is just a simple implementation to allow legacy implementations * compatible with new RISC-V PMU driver framework. * This driver only allows reading two counters i.e CYCLE & INSTRET. |