locking: Fix mutex debug call and ww_mutex doc
PATCH 1/1 locking: Fix mutex debug call and ww_mutex doc
Commit 08295b3b5bee ("Implement an algorithm choice for Wound-Wait mutexes") introduced a reference in the documentation to a function that was removed in an earlier commit.
It also forgot to remove a call to debug_mutex_add_waiter() which is now unconditionally called by __mutex_add_waiter().
Fix those issues.
--- kernel/locking/mutex.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/locking/mutex.c +1 -2
@@ -389,7 +389,7 @@ static bool __ww_mutex_wound(struct mutex *lock,/* * wake_up_process() paired with set_current_state() * inserts sufficient barriers to make sure @owner either sees -* it's wounded in __ww_mutex_lock_check_stamp() or has a +* it's wounded in __ww_mutex_check_kill() or has a * wakeup pending to re-read the wounded state. */ if (owner != current)
@@ -946,7 +946,6 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, }debug_mutex_lock_common (lock, &waiter); -debug_mutex_add_waiter (lock, &waiter, current);lock_contended (&lock->dep_map, ip);
Signature · 1 line
2.18.0.rc1
Peter Zijlstra
maintainerQuoted 11 lines · Thomas Hellstrom
Commit
08295b3b5bee("Implement an algorithm choice for Wound-Wait mutexes") introduced a reference in the documentation to a function that was removed in an earlier commit.It also forgot to remove a call to
debug_mutex_add_waiter()which is now unconditionally called by__mutex_add_waiter().Fix those issues.
Fixes 08295b3b5bee ("Implement an algorithm choice for Wound-Wait mutexes")Signed-off-by Thomas Hellstrom <[email protected]>
Thanks!
tip-bot for Thomas Hellstrom
merge bot[tip:locking/core] locking/mutex: Fix mutex debug call and ww_mutex documentation
In reply to Thomas Hellstromlocking/mutex: Fix mutex debug call and ww_mutex documentation
Commit-ID: e13e2366d8415e029fe96a62502955083e272cef Gitweb: https://git.kernel.org/tip/e13e2366d8415e029fe96a62502955083e272cef Author: Thomas Hellstrom <[email protected]> AuthorDate: Mon, 3 Sep 2018 16:07:08 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 10 Sep 2018 10:05:10 +0200
locking/mutex: Fix mutex debug call and ww_mutex documentation
The following commit:
08295b3b5bee ("Implement an algorithm choice for Wound-Wait mutexes")
introduced a reference in the documentation to a function that was removed in an earlier commit.
It also forgot to remove a call to debug_mutex_add_waiter() which is now unconditionally called by __mutex_add_waiter().
Fix those bugs.
--- kernel/locking/mutex.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/locking/mutex.c +1 -2
@@ -389,7 +389,7 @@ static bool __ww_mutex_wound(struct mutex *lock,/* * wake_up_process() paired with set_current_state() * inserts sufficient barriers to make sure @owner either sees -* it's wounded in __ww_mutex_lock_check_stamp() or has a +* it's wounded in __ww_mutex_check_kill() or has a * wakeup pending to re-read the wounded state. */ if (owner != current)
@@ -946,7 +946,6 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, }debug_mutex_lock_common (lock, &waiter); -debug_mutex_add_waiter (lock, &waiter, current);lock_contended (&lock->dep_map, ip);