From nobody Fri May 31 21:13:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VrbSp4TD4z5LPbQ; Fri, 31 May 2024 21:13:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrbSp3gznz4ZwT; Fri, 31 May 2024 21:13:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717190010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LYK2fvpqOSFvdXY2ZZzrl7lB3au5FDnIvcq69e1hAQU=; b=PdsapOIULrWaU88L79SHViOS/EWfKfHduuxFU7gSe4Zy5e3ZR3TpKpRrWhZOSYPQAqozRI aqIulX9UsgjOhWi1P2e/ySY+q1xHgucrIVKfGQw6fUMC3iP2RqUnnBFlBMok9HC16Y4UHf R2epIH9xBSS8q8Ijqf55D7d+GJo+SJzRHZ9qeXO74WJzvt0j3XZsEkQAPZ7pVUkKUK58Fd Qvcd/6dZd0vkW30Ju2Rsy1DPp5CF6Xn+/PsZBwP8E1MBf2NVl40D43MtuesrjcGmVjARie wOFCmLyFr7k7gARn6HIEhZBwSN4RbBVgqD+hgolNdWs1wZ7wNfHdwEHHsZA84g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717190010; a=rsa-sha256; cv=none; b=bH+FdgUzi6/+iuUpc1x+7UM5Gl3HpnKjwxAAqODuGL0don11i6DRDcEpBQK+L9/al0L2bW fBTrRoUlQXoWZJqi7j9E9F8St2MxikXPM4GckLaLii3DP3Wmeuo11EaXRoSp+kRvmOToHU XmWFEo7eqj0eIrLxbQIxgEm8Gq0Lvc4fmNB8EV5kwLpAMsugvdBluMp+yRecXtTgYMZb01 GfhVzIlREIgvwPHLLZUZjNxez/lPWUyv8O4ffcIx3l6a7B3cAET6gbzNu8yMyJl893rGpR XmVQUIgcZXtHNTyMuJvHBqCbe9fcsSeISSyjSXe+B7KGb4jv3D0+s4rrV31bQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717190010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LYK2fvpqOSFvdXY2ZZzrl7lB3au5FDnIvcq69e1hAQU=; b=hk9mA3LoBmvcpkf2zY0WABVOn712DUJS3Z9q8qV8JCVzIZnwFpr23XiII+fmi9G4vIi6Et pLQR1h7IyCpMTxBYaO+yM2QXxo6j/V2UWSkqd2Ozh6HlrakkT0ZOocrz6ifFl5f3hqY+A4 526uLMxnZ38fG5aHnniV9EuvH+U+vzuWcH/NUKKUz2581JQFsN2xX9zN1XCIqj+YLW0FWI HXosfhheacePnmZrA23wos0p6EygJs3dtrQjUz49T/k4Iyi+Xfmdq652xBRXWPAwk/8FQ4 rNQZpBvbReI35KxuV25QVFUnfjt1GAv8VXB+83mC2oatQ5MXTkysdkC9IhZ8SQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrbSp3H5szg5n; Fri, 31 May 2024 21:13:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44VLDUp4037555; Fri, 31 May 2024 21:13:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VLDUal037552; Fri, 31 May 2024 21:13:30 GMT (envelope-from git) Date: Fri, 31 May 2024 21:13:30 GMT Message-Id: <202405312113.44VLDUal037552@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: fe2b60f87e1e - main - openzfs: Fix mismerge breaking macOS bootstrap List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe2b60f87e1ec45594e61e4e2e5f188640bf540c Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=fe2b60f87e1ec45594e61e4e2e5f188640bf540c commit fe2b60f87e1ec45594e61e4e2e5f188640bf540c Author: Jessica Clarke AuthorDate: 2024-05-31 21:12:18 +0000 Commit: Jessica Clarke 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