diff options
| author | Mark Brown <broonie@kernel.org> | 2025-02-25 13:39:06 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-02-25 13:39:06 +0000 |
| commit | b80fd34df2580f2c7a99e7188d68515bcf779714 (patch) | |
| tree | 5cb104b03241df9cce66268fffbca5702ce3c764 /kernel/futex/waitwake.c | |
| parent | 66d8e76e8e85a30fbf9809837e07e15a8c5ccb8b (diff) | |
| parent | 0dffacbbf8d044456d50c893adb9499775c489f4 (diff) | |
Fix RK3588 power domain problems
Merge series from Sebastian Reichel <sebastian.reichel@collabora.com>:
This introduces devm_of_regulator_get without the _optional suffix, since
that is more sensible for the Rockchip usecase.
Diffstat (limited to 'kernel/futex/waitwake.c')
| -rw-r--r-- | kernel/futex/waitwake.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/futex/waitwake.c b/kernel/futex/waitwake.c index eb86a7ade06a..25877d4f2f8f 100644 --- a/kernel/futex/waitwake.c +++ b/kernel/futex/waitwake.c @@ -349,7 +349,7 @@ void futex_wait_queue(struct futex_hash_bucket *hb, struct futex_q *q, * access to the hash list and forcing another memory barrier. */ set_current_state(TASK_INTERRUPTIBLE|TASK_FREEZABLE); - futex_queue(q, hb); + futex_queue(q, hb, current); /* Arm the timer */ if (timeout) @@ -460,7 +460,7 @@ retry: * next futex. Queue each futex at this moment so hb can * be unlocked. */ - futex_queue(q, hb); + futex_queue(q, hb, current); continue; } |