diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-21 08:53:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-21 08:53:43 +0200 |
| commit | c6d9e43954bfa7415a1e9efdb2806ec1d8a8afc8 (patch) | |
| tree | 4f8b23679ea48fcfbee582f876f62e144c71f8d7 /kernel/events/core.c | |
| parent | xhci: add helper to stop endpoint and wait for completion (diff) | |
| parent | Linux 6.12-rc4 (diff) | |
| download | linux-c6d9e43954bfa7415a1e9efdb2806ec1d8a8afc8.tar.gz linux-c6d9e43954bfa7415a1e9efdb2806ec1d8a8afc8.zip | |
Merge 6.12-rc4 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/events/core.c')
| -rw-r--r-- | kernel/events/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index e3589c4287cb..cdd09769e6c5 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -9251,7 +9251,7 @@ static void perf_event_switch(struct task_struct *task, }, }; - if (!sched_in && task->on_rq) { + if (!sched_in && task_is_runnable(task)) { switch_event.event_id.header.misc |= PERF_RECORD_MISC_SWITCH_OUT_PREEMPT; } |