mirror of
https://github.com/torvalds/linux
synced 2024-10-15 07:47:34 +00:00
Fix a PREEMPT_RT build bug.
Signed-off-by: Ingo Molnar <mingo@kernel.org> -----BEGIN PGP SIGNATURE----- iQJFBAABCgAvFiEEBpT5eoXrXCwVQwEKEnMQ0APhK1gFAmYbjHERHG1pbmdvQGtl cm5lbC5vcmcACgkQEnMQ0APhK1gcpA//am9G8j1scrpDIdlcvqavtw2vN70mlqDo Pu3Dbu3T/SjI1RHLrGoT7nzt9JofCrEEfeE3GbqNgwUiOA3TNMwSPKRJXY1t9Sn3 Cux/UkDt5LNMyICToJdB3rWEHuHN8d4Iej0PtBAqJfgOaNKoLTyV9wx7eQEM2lQJ w0UVZjz01k31i0RHcjxghqcWaAEHUzdfrGhrC8UUp9M1PUK6ZlTZjBGIpSnMQCEN CLDK0Vyo/vk3DkRWATzclKfuMjfRnZa6Xmc1jbZwU1riwC4I2NtzvpxrrA1d3JPz 2x8Vn2z9pr3Z16OMvvL97QB+xffaysP7RfFnK2AHLxo23HIGzdHgYmB34X7ZyU6M 4x48lWtfhXzSZjEJ/FunnsBNGbyeNeBoYFKtfSrc2aMtMBeeZx3gHuwZIESz34xg b8Tjj5Lju6slaULd0aWR1vkFvYrZVr6uqjtpat2Y+m6bG/+Ld+vittF/6fdrN9lx s51rb5TKVmsykCiH+Zrrwdh5WGftxDXZTuAwkPOzbLTNFT5Y898uClvXTcGNfGCg dfMKUt8HmfKbP+0A1IvKKJbpO6TfwIR1WaB87fp9Bc6vtOBL/dk8Tc722i76u/1k xbxNC2B3dL9kEz9VbKBGNVEIB+XvKrtPDEAQp8wZF3AEL/EoAA/49gsdHYOVCnWH 1CvGhfap4DM= =YUeL -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
fa37b3be18
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue