Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 Aug 2025 17:39:08 GMT
From:      Jessica Clarke <jrtc27@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: ca98f5ef86e0 - main - Revert "zfs: add workaround to unbreak kernel compilation on MacOS"
Message-ID:  <202508121739.57CHd83t016266@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jrtc27:

URL: https://cgit.FreeBSD.org/src/commit/?id=ca98f5ef86e0b0642e73a504b7dad20e034c09e7

commit ca98f5ef86e0b0642e73a504b7dad20e034c09e7
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2025-08-12 17:03:45 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
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;
 
 /*



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202508121739.57CHd83t016266>