diff options
author | Ingo Molnar <mingo@kernel.org> | 2024-04-09 09:48:09 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2024-04-09 09:48:09 +0200 |
commit | d1eec383a8abe348b5ce72df9e96bff3d9039134 (patch) | |
tree | 6ea912eb2d4f2bee8301a04ebf82283805218ebf /drivers/perf/riscv_pmu.c | |
parent | x86/tsc: Make __use_tsc __ro_after_init (diff) | |
parent | Linux 6.9-rc3 (diff) | |
download | linux-d1eec383a8abe348b5ce72df9e96bff3d9039134.tar.xz linux-d1eec383a8abe348b5ce72df9e96bff3d9039134.zip |
Merge tag 'v6.9-rc3' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/perf/riscv_pmu.c')
-rw-r--r-- | drivers/perf/riscv_pmu.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/perf/riscv_pmu.c b/drivers/perf/riscv_pmu.c index c78a6fd6c57f..b4efdddb2ad9 100644 --- a/drivers/perf/riscv_pmu.c +++ b/drivers/perf/riscv_pmu.c @@ -313,6 +313,10 @@ static int riscv_pmu_event_init(struct perf_event *event) u64 event_config = 0; uint64_t cmask; + /* driver does not support branch stack sampling */ + if (has_branch_stack(event)) + return -EOPNOTSUPP; + hwc->flags = 0; mapped_event = rvpmu->event_map(event, &event_config); if (mapped_event < 0) { |