diff options
author | Jakub Kicinski <kuba@kernel.org> | 2024-10-03 10:05:55 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2024-10-10 13:13:33 -0700 |
commit | 9c0fc36ec493d20599cf088d21b6bddcdc184242 (patch) | |
tree | 79d8fb91469d59cc1dd0a55477778f0a1167de8f /kernel/kthread.c | |
parent | cd959bf7c3bbaf64a29750c5e36776078a18a8fe (diff) | |
parent | 1d227fcc72223cbdd34d0ce13541cbaab5e0d72f (diff) | |
download | linux-9c0fc36ec493d20599cf088d21b6bddcdc184242.tar.gz linux-9c0fc36ec493d20599cf088d21b6bddcdc184242.tar.bz2 linux-9c0fc36ec493d20599cf088d21b6bddcdc184242.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.12-rc3).
No conflicts and no adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'kernel/kthread.c')
-rw-r--r-- | kernel/kthread.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/kthread.c b/kernel/kthread.c index db4ceb0f503c..9bb36897b6c6 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c @@ -623,6 +623,8 @@ void kthread_unpark(struct task_struct *k) { struct kthread *kthread = to_kthread(k); + if (!test_bit(KTHREAD_SHOULD_PARK, &kthread->flags)) + return; /* * Newly created kthread was parked when the CPU was offline. * The binding was lost and we need to set it again. |