diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2025-04-25 14:55:20 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2025-04-25 14:55:20 +0200 |
| commit | 1caafd919e2a5c483f7a27449f8497fa4b15a44f (patch) | |
| tree | 0cfd4f3121273ae2bee75d3b01e376f742a31406 /kernel/events/core.c | |
| parent | 2492e5aba2be064d0604ae23ae0770ecc0168192 (diff) | |
| parent | 7da9960b59fb7e590eb8538c9428db55a4ea2d23 (diff) | |
| download | linux-next-1caafd919e2a5c483f7a27449f8497fa4b15a44f.tar.gz linux-next-1caafd919e2a5c483f7a27449f8497fa4b15a44f.zip | |
Merge branch 'perf/urgent'
Merge urgent fixes for dependencies.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'kernel/events/core.c')
| -rw-r--r-- | kernel/events/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 07414cb1279b..3c69a1a3f41c 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -3962,7 +3962,7 @@ static int merge_sched_in(struct perf_event *event, void *data) perf_event_set_state(event, PERF_EVENT_STATE_ERROR); if (*perf_event_fasync(event)) - event->pending_kill = POLL_HUP; + event->pending_kill = POLL_ERR; perf_event_wakeup(event); } else { @@ -6075,7 +6075,7 @@ static __poll_t perf_poll(struct file *file, poll_table *wait) if (unlikely(READ_ONCE(event->state) == PERF_EVENT_STATE_ERROR && event->attr.pinned)) - return events; + return EPOLLERR; /* * Pin the event->rb by taking event->mmap_mutex; otherwise |