From nobody Thu Dec 12 14:57:20 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 4Y8Ftm6TbYz5gMxX; Thu, 12 Dec 2024 14:57:20 +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 4Y8Ftm5p5vz4b7W; Thu, 12 Dec 2024 14:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734015440; 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=B/LqDH7pAJ1eM/0YnuxYHNlToUP/PL7uBilfbL1/lqc=; b=HOyLgFWkeYvybZdZsb5Q+6lUDzJf6IBrO3d/IZ+OxCCr+aRQakDRRL1gAHcZHue5dNWa+X IkIr6DGX6Im2oblzleF1/fY/B6FSg2JCqMPH+7pATBWKtgRtqY2gR4oVu9eMUBNPuOHyzN SEbzzTYfdACMIdc/rlwHstshdaKGGHQuJbDasDipEyzOl0c2e6XUNL7DflH1O4G1SNIhYp nX5tNZ/CfHvCO3R+0XXon1LklkbHAu5NM37qaGFSmXlJzcWY8GeESdcKq2hvVOUKwjByO0 pSFmbWCQ1vT/oMOa1LIVEtUuaEdgqgFfo4fDWGlwMc1yukuPBfcsB5S4MXxODg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734015440; 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=B/LqDH7pAJ1eM/0YnuxYHNlToUP/PL7uBilfbL1/lqc=; b=ow6QSlh6gAuuTDbUm9yDCeV62SfR0/N+xYJRaf38Rz0jJJo3NmzAPYoEWnVnsw98d5tC8p aRv2WqNi3f5aj798D7xFsBQ+Gghr7NGMQnxEuqJjuj1o4CC11MJ+5KAB9cXRMWFZ+F38qp qGUnrtokNFSnQwsZNTy4f7rwaih9N0YkhzmH0PcQJG1NluSbWvkZcPrVjiTQZkHekaTg0O JCm0nFia4SrLiM0DR7GPjdnHe3n3Hs2q14QLO5GePHG50RdfQ+3xhIJSnGSGtTzbkdMDfd +kBcW4hB2dWrz94vdaX5z5sWdNFGY//S+X81ehw7PenmhK6FY1yY2AgnHeO1EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734015440; a=rsa-sha256; cv=none; b=NRBtSwuNNAp3en/Iqbl9lbW5JZw3rfqa8I7GuSBnKteVgXYjXufJmDuplHCpcZ9pZyIWl4 qqushQA8RBOU23TMm3og0z/m5CP35FV+BlPnJy8nfZRhmniSzJ3MqDjqSKODR8Aqsu+giZ EsByt4RcFG8P42in+jC4K2W62o2amQd65sL/D5RpQiWhgW3zKCZPzGXfqFKfn1MRlj6peB o0Qimt8DqaWEAc2GlhrD3UHzqWoc6uY8kMnFlUu2lYgf7di2Yjwz2NOP+FMxOn3y2vobGK cQOQ1t/y8n4vp3AjQgZ2jnkBNdVtwa7enjzU/bwLdOgH8pegs7WjMaGpwjwSVw== 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 4Y8Ftm5PTCzxLk; Thu, 12 Dec 2024 14:57:20 +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 4BCEvKnF022167; Thu, 12 Dec 2024 14:57:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCEvKmw022164; Thu, 12 Dec 2024 14:57:20 GMT (envelope-from git) Date: Thu, 12 Dec 2024 14:57:20 GMT Message-Id: <202412121457.4BCEvKmw022164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: a0e2fa50e737 - stable/14 - linux.h: don't redefine lower_32_bits if already defined 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a0e2fa50e737aca9b4adda584a99742aa3959295 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=a0e2fa50e737aca9b4adda584a99742aa3959295 commit a0e2fa50e737aca9b4adda584a99742aa3959295 Author: Warner Losh AuthorDate: 2024-10-15 04:53:55 +0000 Commit: Martin Matuska CommitDate: 2024-12-12 12:21:36 +0000 linux.h: don't redefine lower_32_bits if already defined systrace.c fails to build if we're using a common compiler.h for both openzfs and linuxkpi. The issue is easy enough to fix: don't redefined lower_32_bits if it's already defined in linux.h, since it's the least 'standardized'. This will allow systrace.c to build using an equivalent macro. MFC After: 3 days Sponsored by: Netflix (cherry picked from commit 481d5a4891648f0a6979a48689cc16fca80d4ab6) --- sys/compat/linux/linux.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linux/linux.h b/sys/compat/linux/linux.h index 5a0d6e0b68c5..6d276b8a69f4 100644 --- a/sys/compat/linux/linux.h +++ b/sys/compat/linux/linux.h @@ -350,7 +350,9 @@ struct l_statx { #define LINUX_ST_RELATIME 0x1000 /* No native analogue */ #define LINUX_ST_NOSYMFOLLOW 0x2000 +#ifndef lower_32_bits #define lower_32_bits(n) ((uint32_t)((n) & 0xffffffff)) +#endif #ifdef KTRACE #define linux_ktrsigset(s, l) \