diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-23 06:30:08 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-23 06:30:08 -1000 |
| commit | 0898678c742ee913691d7f4a1606309825eee33b (patch) | |
| tree | 295cbe24bea6550d208dee4862d32d1354b9cc97 /kernel/locking/mutex-debug.h | |
| parent | f73d2a429334dbd30bc9a7e5ef5e07a676d3d499 (diff) | |
| parent | 3a010c493271f04578b133de977e0e5dd2848cea (diff) | |
Merge tag 'locking-urgent-2021-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Thomas Gleixner:
"Two locking fixes:
- Invoke the lockdep tracepoints in the correct place so the ordering
is correct again
- Don't leave the mutex WAITER bit stale when the last waiter is
dropping out early due to a signal as that forces all subsequent
lock operations needlessly into the slowpath until it's cleaned up
again"
* tag 'locking-urgent-2021-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking/mutex: clear MUTEX_FLAGS if wait_list is empty due to signal
locking/lockdep: Correct calling tracepoints
Diffstat (limited to 'kernel/locking/mutex-debug.h')
| -rw-r--r-- | kernel/locking/mutex-debug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h index 1edd3f45a4ec..53e631e1d76d 100644 --- a/kernel/locking/mutex-debug.h +++ b/kernel/locking/mutex-debug.h @@ -22,7 +22,7 @@ extern void debug_mutex_free_waiter(struct mutex_waiter *waiter); extern void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter, struct task_struct *task); -extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter, +extern void debug_mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter, struct task_struct *task); extern void debug_mutex_unlock(struct mutex *lock); extern void debug_mutex_init(struct mutex *lock, const char *name, |