The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=fe2b60f87e1ec45594e61e4e2e5f188640bf540c
commit fe2b60f87e1ec45594e61e4e2e5f188640bf540c Author: Jessica Clarke <[email protected]> AuthorDate: 2024-05-31 21:12:18 +0000 Commit: Jessica Clarke <[email protected]> CommitDate: 2024-05-31 21:12:18 +0000 openzfs: Fix mismerge breaking macOS bootstrap Upstream added the libspl_gettid implementation for macOS and when merging back to FreeBSD this resulted in two copies of the same code. Delete this second copy, restoring the file to be the same as upstream. Fixes: aca928a50a42 ("zfs: merge openzfs/zfs@e2357561b") --- sys/contrib/openzfs/lib/libspl/assert.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/sys/contrib/openzfs/lib/libspl/assert.c b/sys/contrib/openzfs/lib/libspl/assert.c index 315ddd6b9a9d..d11361b387e2 100644 --- a/sys/contrib/openzfs/lib/libspl/assert.c +++ b/sys/contrib/openzfs/lib/libspl/assert.c @@ -65,19 +65,6 @@ libspl_gettid(void) } #endif -#if defined(__APPLE__) -static inline uint64_t -libspl_gettid(void) -{ - uint64_t tid; - - if (pthread_threadid_np(NULL, &tid) != 0) - tid = 0; - - return (tid); -} -#endif - static boolean_t libspl_assert_ok = B_FALSE; void
