diff options
| author | Will Deacon <will@kernel.org> | 2024-01-04 12:28:46 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2024-01-04 12:32:33 +0000 |
| commit | db32cf8e280b46726065c518e90761bb0229bacf (patch) | |
| tree | 9b6c6129f6832b0850dcc24dcdc4491c4caa96d0 /drivers/perf/arm-cmn.c | |
| parent | 3e8626b4ed5679812a496d43dcd1fab1fae546f4 (diff) | |
| parent | 3c0696076aad60a2f04c019761921954579e1b0e (diff) | |
| download | linux-stable-db32cf8e280b46726065c518e90761bb0229bacf.tar.gz linux-stable-db32cf8e280b46726065c518e90761bb0229bacf.tar.bz2 linux-stable-db32cf8e280b46726065c518e90761bb0229bacf.zip | |
Merge branch 'for-next/fixes' into for-next/core
Merge in arm64 fixes queued for 6.7 so that kpti_install_ng_mappings()
can be updated to use arm64_kernel_unmapped_at_el0() instead of checking
the ARM64_UNMAP_KERNEL_AT_EL0 CPU capability directly.
* for-next/fixes:
arm64: mm: Always make sw-dirty PTEs hw-dirty in pte_modify
perf/arm-cmn: Fail DTC counter allocation correctly
arm64: Avoid enabling KPTI unnecessarily
Diffstat (limited to 'drivers/perf/arm-cmn.c')
| -rw-r--r-- | drivers/perf/arm-cmn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c index 86d970e74129..c584165b13ba 100644 --- a/drivers/perf/arm-cmn.c +++ b/drivers/perf/arm-cmn.c @@ -1816,7 +1816,7 @@ static int arm_cmn_event_add(struct perf_event *event, int flags) idx = 0; while (cmn->dtc[j].counters[idx]) if (++idx == CMN_DT_NUM_COUNTERS) - goto free_dtms; + return -ENOSPC; } hw->dtc_idx[j] = idx; } |