Skip to content

Commit fe5881e

Browse files
committed
Merge tag 'locking-urgent-2026-07-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull futex fix from Ingo Molnar: - Fix a futex-requeue deadlock detection regression (Thomas Gleixner) * tag 'locking-urgent-2026-07-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: futex/requeue: Revert "Prevent NULL pointer dereference in remove_waiter() on self-deadlock""
2 parents 610533c + 39def6d commit fe5881e

1 file changed

Lines changed: 0 additions & 6 deletions

File tree

kernel/futex/requeue.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -645,12 +645,6 @@ int futex_requeue(u32 __user *uaddr1, unsigned int flags1,
645645
continue;
646646
}
647647

648-
/* Self-deadlock: non-top waiter already owns the PI futex. */
649-
if (rt_mutex_owner(&pi_state->pi_mutex) == this->task) {
650-
ret = -EDEADLK;
651-
break;
652-
}
653-
654648
ret = rt_mutex_start_proxy_lock(&pi_state->pi_mutex,
655649
this->rt_waiter,
656650
this->task);

0 commit comments

Comments
 (0)