summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-04-14 10:26:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2024-04-14 10:26:27 -0700
commita1505c47e78a4d4837e2c72b2d5f51e821689349 (patch)
tree57980720522fe6cfc22d6319eccc50561b1d6f03 /arch
parentfa37b3be189606d8af1888b490342f7aa4cc8023 (diff)
parentdec8ced871e17eea46f097542dd074d022be4bd1 (diff)
Merge tag 'perf-urgent-2024-04-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf event fix from Ingo Molnar: "Fix the x86 PMU multi-counter code returning invalid data in certain circumstances" * tag 'perf-urgent-2024-04-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86: Fix out of range data
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/events/core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index 09050641ce5d..5b0dd07b1ef1 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -1644,6 +1644,7 @@ static void x86_pmu_del(struct perf_event *event, int flags)
while (++i < cpuc->n_events) {
cpuc->event_list[i-1] = cpuc->event_list[i];
cpuc->event_constraint[i-1] = cpuc->event_constraint[i];
+ cpuc->assign[i-1] = cpuc->assign[i];
}
cpuc->event_constraint[i-1] = NULL;
--cpuc->n_events;