hc
2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f
kernel/kernel/futex.c
....@@ -1499,7 +1499,6 @@
14991499 struct task_struct *new_owner;
15001500 bool postunlock = false;
15011501 DEFINE_WAKE_Q(wake_q);
1502
- DEFINE_WAKE_Q(wake_sleeper_q);
15031502 int ret = 0;
15041503
15051504 new_owner = rt_mutex_next_owner(&pi_state->pi_mutex);
....@@ -1549,15 +1548,14 @@
15491548 * not fail.
15501549 */
15511550 pi_state_update_owner(pi_state, new_owner);
1552
- postunlock = __rt_mutex_futex_unlock(&pi_state->pi_mutex, &wake_q,
1553
- &wake_sleeper_q);
1551
+ postunlock = __rt_mutex_futex_unlock(&pi_state->pi_mutex, &wake_q);
15541552 }
15551553
15561554 out_unlock:
15571555 raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
15581556
15591557 if (postunlock)
1560
- rt_mutex_postunlock(&wake_q, &wake_sleeper_q);
1558
+ rt_mutex_postunlock(&wake_q);
15611559
15621560 return ret;
15631561 }
....@@ -2861,7 +2859,7 @@
28612859 goto no_block;
28622860 }
28632861
2864
- rt_mutex_init_waiter(&rt_waiter, false);
2862
+ rt_mutex_init_waiter(&rt_waiter);
28652863
28662864 /*
28672865 * On PREEMPT_RT_FULL, when hb->lock becomes an rt_mutex, we must not
....@@ -3207,7 +3205,7 @@
32073205 * The waiter is allocated on our stack, manipulated by the requeue
32083206 * code while we sleep on uaddr.
32093207 */
3210
- rt_mutex_init_waiter(&rt_waiter, false);
3208
+ rt_mutex_init_waiter(&rt_waiter);
32113209
32123210 ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, FUTEX_WRITE);
32133211 if (unlikely(ret != 0))