tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: sched: Remove set_blocked_on_waking_nested() warning

Browse Source 
In e740e8d9ea ("ANDROID: Sync proxy-exec logic to v19 (from v18)"),
I consolidated logic in both __ww_mutex_wound() and __ww_mutex_die()
to use a new set_blocked_on_waking_nested() helper.

This helper included a WARN_ON() used in __ww_mutex_die(), but this
assertion isn't generally true in the __ww_mutex_wound() case, but
adding the helper caused it to be used in both.

So drop the warning from the set_blocked_on_waking_nested() helper.

This was already addressed in the v20 series of the proxy-exec patch
set, along with other cleanups, but I missed that I should port it
to andorid16-6.12.

Since the v20 change is a little more complex, and vendors are
hitting this right now, this patch simply drops the incorrect
warning.

Bug: 434841783
Fixes: e740e8d9ea ("ANDROID: Sync proxy-exec logic to v19 (from v18)")
Change-Id: I8f611b60b855cdf81af84ad9c575117340431848
Signed-off-by: John Stultz <jstultz@google.com>
This commit is contained in:
John Stultz
2025-07-29 23:21:23 +00:00
parent e24b0a3d32
commit cab1c94446
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/sched.h
-1
View File
@@ -2249,7 +2249,6 @@ static inline struct mutex *__get_task_blocked_on(struct task_struct *p)
static inline void set_blocked_on_waking_nested(struct task_struct *p, struct mutex *m)
{
raw_spin_lock_nested(&p->blocked_lock, SINGLE_DEPTH_NESTING);
WARN_ON_ONCE(__get_task_blocked_on(p) != m);
__set_blocked_on_waking(p);
raw_spin_unlock(&p->blocked_lock);
}