diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-02-17 07:33:47 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-02-17 07:33:47 +0100 |
| commit | f8da37e46253316d29a274a6747cb69007bc81f2 (patch) | |
| tree | aac031dca475c4ed8308696e151d55e7a1b94d8c /kernel/workqueue.c | |
| parent | usb: typec: Add support for Parade PS8830 Type-C Retimer (diff) | |
| parent | Linux 6.14-rc3 (diff) | |
| download | linux-f8da37e46253316d29a274a6747cb69007bc81f2.tar.gz linux-f8da37e46253316d29a274a6747cb69007bc81f2.zip | |
Merge 6.14-rc3 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/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 3c2c45313c88..97152f2250fe 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -3517,12 +3517,6 @@ repeat: } /* - * Put the reference grabbed by send_mayday(). @pool won't - * go away while we're still attached to it. - */ - put_pwq(pwq); - - /* * Leave this pool. Notify regular workers; otherwise, we end up * with 0 concurrency and stalling the execution. */ @@ -3532,6 +3526,12 @@ repeat: worker_detach_from_pool(rescuer); + /* + * Put the reference grabbed by send_mayday(). @pool might + * go away any time after it. + */ + put_pwq_unlocked(pwq); + raw_spin_lock_irq(&wq_mayday_lock); } |