tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 2368fcf3 7a396820

options
unified split
Changed files
+6 -6
include
linux
spinlock.h
+6 -6
include/linux/spinlock.h
··· 449 449 return raw_spin_is_contended(&lock->rlock); 450 450 } 451 451 452 + #define assert_spin_locked(lock) assert_raw_spin_locked(&(lock)->rlock) 453 + 454 + #else /* !CONFIG_PREEMPT_RT */ 455 + # include <linux/spinlock_rt.h> 456 + #endif /* CONFIG_PREEMPT_RT */ 457 + 452 458 /* 453 459 * Does a critical section need to be broken due to another 454 460 * task waiting?: (technically does not depend on CONFIG_PREEMPTION, ··· 485 479 return 0; 486 480 #endif 487 481 } 488 - 489 - #define assert_spin_locked(lock) assert_raw_spin_locked(&(lock)->rlock) 490 - 491 - #else /* !CONFIG_PREEMPT_RT */ 492 - # include <linux/spinlock_rt.h> 493 - #endif /* CONFIG_PREEMPT_RT */ 494 482 495 483 /* 496 484 * Pull the atomic_t declaration: