diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-21 19:21:43 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-21 19:21:43 +0100 |
| commit | 2368fcf341d3a6aa143e3cdfb0440fabd152c83b (patch) | |
| tree | 0547337c46e5b9f2fcc1d41b4690205f1da619f0 /include | |
| parent | Merge tag 'v6.8-rc-part2-smb-client' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| parent | spinlock: Fix failing build for PREEMPT_RT (diff) | |
| download | linux-2368fcf341d3a6aa143e3cdfb0440fabd152c83b.tar.xz linux-2368fcf341d3a6aa143e3cdfb0440fabd152c83b.zip | |
Merge tag 'header_cleanup-2024-01-20' of https://evilpiepirate.org/git/bcachefs
Pull header fix from Kent Overstreet:
"Just one small fixup for the RT build"
* tag 'header_cleanup-2024-01-20' of https://evilpiepirate.org/git/bcachefs:
spinlock: Fix failing build for PREEMPT_RT
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/spinlock.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index eaac8b0da25b..3fcd20de6ca8 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h @@ -449,6 +449,12 @@ static __always_inline int spin_is_contended(spinlock_t *lock) return raw_spin_is_contended(&lock->rlock); } +#define assert_spin_locked(lock) assert_raw_spin_locked(&(lock)->rlock) + +#else /* !CONFIG_PREEMPT_RT */ +# include <linux/spinlock_rt.h> +#endif /* CONFIG_PREEMPT_RT */ + /* * Does a critical section need to be broken due to another * task waiting?: (technically does not depend on CONFIG_PREEMPTION, @@ -480,12 +486,6 @@ static inline int rwlock_needbreak(rwlock_t *lock) #endif } -#define assert_spin_locked(lock) assert_raw_spin_locked(&(lock)->rlock) - -#else /* !CONFIG_PREEMPT_RT */ -# include <linux/spinlock_rt.h> -#endif /* CONFIG_PREEMPT_RT */ - /* * Pull the atomic_t declaration: * (asm-mips/atomic.h needs above definitions) |