diff options
| author | Thomas Gleixner <tglx@kernel.org> | 2026-07-05 14:45:21 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@kernel.org> | 2026-07-05 14:45:21 +0200 |
| commit | 4a023120989abefd9331f0069f44c7d5697c24e9 (patch) | |
| tree | 10685be6c6b3578f0efc5b57da829d013864268c | |
| parent | d7b2769f8dba3e5f40d2a8a11988812d51160b17 (diff) | |
| parent | 39def6d250d370298f86c116f4ac60093cefadaa (diff) | |
| download | linux-4a023120989abefd9331f0069f44c7d5697c24e9.tar.gz linux-4a023120989abefd9331f0069f44c7d5697c24e9.zip | |
Merge branch 'locking/urgent' into locking/futex
Pick up the upstream fix for consistency.
| -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); |