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:	aca928a50a ("zfs: merge openzfs/zfs@e2357561b")

This commit is contained in:

Jessica Clarke

2024-05-31 22:12:18 +01:00

parent 9c0d6df100

commit fe2b60f87e

1 changed files with 0 additions and 13 deletions

									
										sys/contrib/openzfs/lib/libspl/assert.c
									
		-13
	
												View File
												
				@@ -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