The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=012e32c66529ba74a80b7a02da6c983d5a2c2f70
commit 012e32c66529ba74a80b7a02da6c983d5a2c2f70 Author: Ryan Libby <rli...@freebsd.org> AuthorDate: 2024-06-24 17:05:58 +0000 Commit: Ryan Libby <rli...@freebsd.org> CommitDate: 2024-06-24 17:05:58 +0000 libthr: move __always_inline to canonical position Ahead of including inline in __always_inline, move __always_inline to where inline goes. Reviewed by: imp, kib, olce Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D45710 --- lib/libthr/thread/thr_rwlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libthr/thread/thr_rwlock.c b/lib/libthr/thread/thr_rwlock.c index b482dc8b732a..084181ba922a 100644 --- a/lib/libthr/thread/thr_rwlock.c +++ b/lib/libthr/thread/thr_rwlock.c @@ -59,7 +59,7 @@ __weak_reference(_pthread_rwlock_timedwrlock, pthread_rwlock_timedwrlock); static int init_static(struct pthread *thread, pthread_rwlock_t *rwlock); static int init_rwlock(pthread_rwlock_t *rwlock, pthread_rwlock_t *rwlock_out); -static int __always_inline +static __always_inline int check_and_init_rwlock(pthread_rwlock_t *rwlock, pthread_rwlock_t *rwlock_out) { if (__predict_false(*rwlock == THR_PSHARED_PTR ||