From nobody Tue Aug 12 17:39:08 2025 X-Original-To: dev-commits-src-main@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 4c1dzJ7260z659c3; Tue, 12 Aug 2025 17:39:08 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c1dzJ61m1z3xN8; Tue, 12 Aug 2025 17:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755020348; 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=ks8yQTIMJZiKkXZRZn8i14CZRSTDji3tTCfXWzBooY0=; b=SkSvfTAYVXKm1al4RPvk6VM2rLiIY33ijFsv7XVDBlz5TErZcUNDrlOxBmVhMbQwiAj8ZB 6F3eK4rZJd7F3B4a0Dy1T6tgvoWPzjz8xlcRCWyIIKjIoNVY3FzrnQWgqo6EmqJNs6eDPy 2dwxemb3J9EXL4cZBjW5wY8iINeGozpHHdzlQM75/+bE7jirbXjz/VRe1fzQouu096d6Re m1k5fMnWrCcpm3tcH4svfspWym/kkFuTb/QPHZ+wkahtSdbbcIBKuDEDOMKyC0B/3TLSgO m6+6IwwQrPXwLRfj75Ywx0bjLzi1bD9c8jPXls75DxNMmbiOwReC0O6e9PveVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755020348; 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=ks8yQTIMJZiKkXZRZn8i14CZRSTDji3tTCfXWzBooY0=; b=lR1ZYZDsnS+7Kb7/KeD+2zHhxCZuKG1EgjfvJQE/dYfXMIXtMjNaCNvag/V1Le51n/gXkU NhNZlGDjy4KdYYzSNY0QLSUP/x4n91DSJABuzjTIIfTdmRKEUiUMU1RJi2ijBgMVHWQKPI HEtysQNWmYFraA39CEH44v1fhPTR31xQsY9GY1l9yyQVkbP5r8YHu49YlIKYCvd2/Gvn/r +00SBNJPNqCv1P0IBQ1PlhQG0sN5jB2B0Ci9SkHlL1NPnjUAGUuFAtF59gxfy/WjTZyx8X Av/aRyg7Td/wsSaxRXdtkXf+6ejc5VZXt/G8/VkkCt9YpvKoUOqQ9nWmsBlwzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755020348; a=rsa-sha256; cv=none; b=IGlN1EMUx4pBcTHcLV1h3dAto9Tj4qhEUGwLXedEB+/83yvhnrPTaLnqwKk3dfyKNi4y49 S6/nDAwn4T7eKdAcBl46SNlHNcPapNvnfCJaDKfDD5IJZvbuWGK3cGxm5ksIrn7KYuNIqX N7FG42JKSYK4Fyk7X/rO/pp8aGiX2yufOLt3CXUpyGkBsjRsX0cDcCaiVMeWIGaO3gU0Vc UccT43ZPSKqwaal7hPbcouxzOnuH4RIWzAJRqoQkkhshyjWO2i21eO+S3t3Nh3epczCKQd mOgq5ejJyN2fYmws8Mc8SaANcqWZGK6OheqI/uf7syWOkmnLdAyaQOuo1xzelQ== 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 4c1dzJ5TGfznPj; Tue, 12 Aug 2025 17:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57CHd8ie016269; Tue, 12 Aug 2025 17:39:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57CHd83t016266; Tue, 12 Aug 2025 17:39:08 GMT (envelope-from git) Date: Tue, 12 Aug 2025 17:39:08 GMT Message-Id: <202508121739.57CHd83t016266@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: ca98f5ef86e0 - main - Revert "zfs: add workaround to unbreak kernel compilation on MacOS" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: ca98f5ef86e0b0642e73a504b7dad20e034c09e7 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ca98f5ef86e0b0642e73a504b7dad20e034c09e7 commit ca98f5ef86e0b0642e73a504b7dad20e034c09e7 Author: Jessica Clarke AuthorDate: 2025-08-12 17:03:45 +0000 Commit: Jessica Clarke CommitDate: 2025-08-12 17:38:56 +0000 Revert "zfs: add workaround to unbreak kernel compilation on MacOS" This is no longer needed now we don't include tunables.c in the bootstrap libspl. This reverts commit 6188ca6a9d72af9be987e1aedc345210f834ad80. --- sys/contrib/openzfs/lib/libspl/tunables.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/contrib/openzfs/lib/libspl/tunables.c b/sys/contrib/openzfs/lib/libspl/tunables.c index 2e9535f1fbf9..67dc9710dee8 100644 --- a/sys/contrib/openzfs/lib/libspl/tunables.c +++ b/sys/contrib/openzfs/lib/libspl/tunables.c @@ -74,9 +74,7 @@ extern const zfs_tunable_t *__stop_zfs_tunables; * any NULL pointers. */ static void *__zfs_tunable__placeholder -#if !defined(__APPLE__) __attribute__((__section__("zfs_tunables"))) -#endif __attribute__((__used__)) = NULL; /*