BackPup/Linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-23 23:10:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'locking-urgent-2024-04-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
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
This commit is contained in:
Linus Torvalds
2024-04-14 10:13:56 -07:00
parent c28275e743 fa1f511623
commit fa37b3be18
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/rwbase_rt.h
View File

@@ -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)

6
include/linux/rwsem.h
View File

@@ -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)