From fe2b60f87e1ec45594e61e4e2e5f188640bf540c Mon Sep 17 00:00:00 2001
From: Jessica Clarke <jrtc27@FreeBSD.org>
Date: Fri, 31 May 2024 22:12:18 +0100
Subject: [PATCH] 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 315ddd6b9a9..d11361b387e 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