Commit 2368fcf3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7a396820 5f4c01f1

include/linux/spinlock.h

+6 −6
Original line number Diff line number Diff line
@@ -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)