summaryrefslogtreecommitdiff
path: root/kernel/events
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-09-15 08:26:05 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-09-15 08:26:05 +0200
commitc319c4ec062477edd0d14b79e2f3a9bd26a9a82e (patch)
tree0d8ab99d0c73413c002c1a9ef06f621014502805 /kernel/events
parent3b5eba544a8af6826209d34daf6197b79b1333bf (diff)
parentf83ec76bf285bea5727f478a68b894f5543ca76e (diff)
Merge 6.17-rc6 into driver-core-next
We need the driver core fixes in here to build on top of. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/events')
-rw-r--r--kernel/events/core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 155bb686c8ce..68da97d60f5b 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -10330,6 +10330,7 @@ static int __perf_event_overflow(struct perf_event *event,
ret = 1;
event->pending_kill = POLL_HUP;
perf_event_disable_inatomic(event);
+ event->pmu->stop(event, 0);
}
if (event->attr.sigtrap) {