diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2026-07-10 10:05:52 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2026-07-10 10:20:05 +0200 |
| commit | b470fde8f77b56ff273c5527484b99499b894e16 (patch) | |
| tree | bbf78ca301e5ead11fc65f51c1b2a4a06b5b81c7 /kernel/futex/requeue.c | |
| parent | fe3e786ef4eb6e47d2901f568a27bd920477bbe9 (diff) | |
| parent | 2c7c88a412aa6d09cd04b414211b4ef8553b5309 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-7.2-rc3).
Conflicts:
tools/testing/selftests/net/lib.sh
dd6a23bac306b ("selftests: net: make busywait timeout clock portable")
895bad9cc4cec ("selftests: net: make busywait timeout clock portable")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'kernel/futex/requeue.c')
| -rw-r--r-- | kernel/futex/requeue.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/kernel/futex/requeue.c b/kernel/futex/requeue.c index 7384672916fb..79823ad13683 100644 --- a/kernel/futex/requeue.c +++ b/kernel/futex/requeue.c @@ -645,12 +645,6 @@ retry_private: continue; } - /* Self-deadlock: non-top waiter already owns the PI futex. */ - if (rt_mutex_owner(&pi_state->pi_mutex) == this->task) { - ret = -EDEADLK; - break; - } - ret = rt_mutex_start_proxy_lock(&pi_state->pi_mutex, this->rt_waiter, this->task); |