diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-14 10:13:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-14 10:13:56 -0700 |
| commit | fa37b3be189606d8af1888b490342f7aa4cc8023 (patch) | |
| tree | b8a3d70dbf856d14820cde8adb27d15c9eb7fdde /include | |
| parent | c28275e7434e8e7c3e7cd366ad03b9aac55f8b67 (diff) | |
| parent | fa1f51162338b3e2f520d4bfedc42b3b2e00da6d (diff) | |
| download | linux-stable-fa37b3be189606d8af1888b490342f7aa4cc8023.tar.gz linux-stable-fa37b3be189606d8af1888b490342f7aa4cc8023.tar.bz2 linux-stable-fa37b3be189606d8af1888b490342f7aa4cc8023.zip | |
Merge tag 'locking-urgent-2024-04-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fix from Ingo Molnar:
"Fix a PREEMPT_RT build bug"
* tag 'locking-urgent-2024-04-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking: Make rwsem_assert_held_write_nolockdep() build with PREEMPT_RT=y
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/rwbase_rt.h | 4 | ||||
| -rw-r--r-- | include/linux/rwsem.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/rwbase_rt.h b/include/linux/rwbase_rt.h index 29c4e4f243e4..f2394a409c9d 100644 --- a/include/linux/rwbase_rt.h +++ b/include/linux/rwbase_rt.h @@ -31,9 +31,9 @@ static __always_inline bool rw_base_is_locked(const struct rwbase_rt *rwb) return atomic_read(&rwb->readers) != READER_BIAS; } -static inline void rw_base_assert_held_write(const struct rwbase_rt *rwb) +static __always_inline bool rw_base_is_write_locked(const struct rwbase_rt *rwb) { - WARN_ON(atomic_read(&rwb->readers) != WRITER_BIAS); + return atomic_read(&rwb->readers) == WRITER_BIAS; } static __always_inline bool rw_base_is_contended(const struct rwbase_rt *rwb) diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h index 4f1c18992f76..c8b543d428b0 100644 --- a/include/linux/rwsem.h +++ b/include/linux/rwsem.h @@ -167,14 +167,14 @@ static __always_inline int rwsem_is_locked(const struct rw_semaphore *sem) return rw_base_is_locked(&sem->rwbase); } -static inline void rwsem_assert_held_nolockdep(const struct rw_semaphore *sem) +static __always_inline void rwsem_assert_held_nolockdep(const struct rw_semaphore *sem) { WARN_ON(!rwsem_is_locked(sem)); } -static inline void rwsem_assert_held_write_nolockdep(const struct rw_semaphore *sem) +static __always_inline void rwsem_assert_held_write_nolockdep(const struct rw_semaphore *sem) { - rw_base_assert_held_write(sem); + WARN_ON(!rw_base_is_write_locked(&sem->rwbase)); } static __always_inline int rwsem_is_contended(struct rw_semaphore *sem) |