diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-14 20:14:07 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-14 20:14:07 +0200 |
commit | 2772d7df3c93f15e5b2119bd9e14724db6a21a04 (patch) | |
tree | eab0a348c25750f24842f068d6cf9352e8764555 /drivers | |
parent | Merge tag 'pm-6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae... (diff) | |
parent | RISC-V: Don't include Zicsr or Zifencei in I from ACPI (diff) | |
download | linux-2772d7df3c93f15e5b2119bd9e14724db6a21a04.tar.xz linux-2772d7df3c93f15e5b2119bd9e14724db6a21a04.zip |
Merge tag 'riscv-for-linus-6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux
Pull RISC-V fixes from Palmer Dabbelt:
- fix a formatting error in the hwprobe documentation
- fix a spurious warning in the RISC-V PMU driver
- fix memory detection on rv32 (problem does not manifest on any known
system)
- avoid parsing legacy parsing of I in ACPI ISA strings
* tag 'riscv-for-linus-6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
RISC-V: Don't include Zicsr or Zifencei in I from ACPI
riscv: mm: fix truncation warning on RV32
perf: RISC-V: Remove PERF_HES_STOPPED flag checking in riscv_pmu_start()
Documentation: RISC-V: hwprobe: Fix a formatting error
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/perf/riscv_pmu.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/perf/riscv_pmu.c b/drivers/perf/riscv_pmu.c index ebca5eab9c9b..56897d4d4fd3 100644 --- a/drivers/perf/riscv_pmu.c +++ b/drivers/perf/riscv_pmu.c @@ -181,9 +181,6 @@ void riscv_pmu_start(struct perf_event *event, int flags) uint64_t max_period = riscv_pmu_ctr_get_width_mask(event); u64 init_val; - if (WARN_ON_ONCE(!(event->hw.state & PERF_HES_STOPPED))) - return; - if (flags & PERF_EF_RELOAD) WARN_ON_ONCE(!(event->hw.state & PERF_HES_UPTODATE)); |