Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+5
-5
+2
-2
include/linux/rwbase_rt.h
+2
-2
include/linux/rwbase_rt.h
···
31
31
return atomic_read(&rwb->readers) != READER_BIAS;
32
32
}
33
33
34
-
static inline void rw_base_assert_held_write(const struct rwbase_rt *rwb)
34
+
static __always_inline bool rw_base_is_write_locked(const struct rwbase_rt *rwb)
35
35
{
36
-
WARN_ON(atomic_read(&rwb->readers) != WRITER_BIAS);
36
+
return atomic_read(&rwb->readers) == WRITER_BIAS;
37
37
}
38
38
39
39
static __always_inline bool rw_base_is_contended(const struct rwbase_rt *rwb)
+3
-3
include/linux/rwsem.h
+3
-3
include/linux/rwsem.h
···
167
167
return rw_base_is_locked(&sem->rwbase);
168
168
}
169
169
170
-
static inline void rwsem_assert_held_nolockdep(const struct rw_semaphore *sem)
170
+
static __always_inline void rwsem_assert_held_nolockdep(const struct rw_semaphore *sem)
171
171
{
172
172
WARN_ON(!rwsem_is_locked(sem));
173
173
}
174
174
175
-
static inline void rwsem_assert_held_write_nolockdep(const struct rw_semaphore *sem)
175
+
static __always_inline void rwsem_assert_held_write_nolockdep(const struct rw_semaphore *sem)
176
176
{
177
-
rw_base_assert_held_write(sem);
177
+
WARN_ON(!rw_base_is_write_locked(&sem->rwbase));
178
178
}
179
179
180
180
static __always_inline int rwsem_is_contended(struct rw_semaphore *sem)