diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-28 12:12:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-28 12:12:22 -0700 |
| commit | 47fbbc94dab61a1385f21a0a209c61b5d6b0a215 (patch) | |
| tree | d146aca86eb7ee359695f36ca305ea6ac01bb684 | |
| parent | 81b1d39fd39a0ecfd30606714bcc05da586044f9 (diff) | |
| parent | 291da9d4a9eb3a1cb0610b7f4480f5b52b1825e7 (diff) | |
| download | lwn-47fbbc94dab61a1385f21a0a209c61b5d6b0a215.tar.gz lwn-47fbbc94dab61a1385f21a0a209c61b5d6b0a215.zip | |
Merge tag 'locking-urgent-2021-03-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fix from Ingo Molnar:
"Fix the non-debug mutex_lock_io_nested() method to map to
mutex_lock_io() instead of mutex_lock().
Right now nothing uses this API explicitly, but this is an
accident waiting to happen"
* tag 'locking-urgent-2021-03-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking/mutex: Fix non debug version of mutex_lock_io_nested()
| -rw-r--r-- | include/linux/mutex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mutex.h b/include/linux/mutex.h index 0cd631a19727..515cff77a4f4 100644 --- a/include/linux/mutex.h +++ b/include/linux/mutex.h @@ -185,7 +185,7 @@ extern void mutex_lock_io(struct mutex *lock); # define mutex_lock_interruptible_nested(lock, subclass) mutex_lock_interruptible(lock) # define mutex_lock_killable_nested(lock, subclass) mutex_lock_killable(lock) # define mutex_lock_nest_lock(lock, nest_lock) mutex_lock(lock) -# define mutex_lock_io_nested(lock, subclass) mutex_lock(lock) +# define mutex_lock_io_nested(lock, subclass) mutex_lock_io(lock) #endif /* |