From nobody Sat Dec 28 18:55:01 2024 X-Original-To: dev-commits-src-branches@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 4YLBPd6yyyz5j364; Sat, 28 Dec 2024 18:55:01 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLBPd54xkz505g; Sat, 28 Dec 2024 18:55:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412101; 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=mk4nyABINdp/kMNeY2KRVPz0Wrja4S9gcJmbbxMCH8g=; b=e2znD/u08b4QpOXAR+DABpUDFvCYUNdpJFZ2C0JN7WvIytPSKGLILXjgT3/yEvfr+bJ6r6 jkhBLEqm3AGjVdMIGe3q5vSZV5iNtxjDkRLJAHIU+ntUzF5X+rr2t5caQGp3M2IP9n2SXH tIgJ9O9nwgZ3f3Q3aNTRMr3OoW3o6e1895KzQp4iZI3Ebhkt+5v77EF50OG/NPvivKoMo6 cJaYDKhjiyHDhG74GxN9iHtaXOG5adJjGRrWlR6hvynf6gBKr9WvXl0KEgSXrc6rUv+cxy AIUqJqA6cjPa0ADw0he950EocR4EHIpsVvHp96R97j/S1V56WElxXKt387KKjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735412101; 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=mk4nyABINdp/kMNeY2KRVPz0Wrja4S9gcJmbbxMCH8g=; b=jZ957Moipd7G/oGkOVMmZkRCXBbOFajSfh1k4D+2BGcEvFfqZU3I7K5WfsPNjCrYlsb1YL xUqP4VzcAn/dO/qm7bRLjUMZrUJnGw3eo/JcJKSf6khgD3YHS06bHHZEDEi/kU+nQdW/tW JehBcoQJfdOn8DGiKUP1+OHdzrag4EzghuttHDTB0ie4d1aRnG+Yq7oigmrkBzCf49p1HU /zr1eY50u1OBPAb65ZYHGnPsCujgGQ+AKW04kTKRGBYZu/iSio6Ol9z8e1aWA83pnYlGw7 S73dkOYOCVXLOcCjNVmb+4Jo3qPLwU6VUaNphahFAt5WQeCpMBTpG2AS4Z7LBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735412101; a=rsa-sha256; cv=none; b=ogbAWjGXZUGgFBiV8KxVjlq4CrqOlvQLNoNfDF+GBM5WER61W/mVdktqTcCzFCJ0xCG7XQ WPZBxDklL98E+hkTY04XEnHRyg7KnkJoTvpyfec5u5S+SfMMuPSpj5x7Kn2Ot/CHGmDi3F RofE/LxPYAwhxmmEivbQcyLFhFxIUIpFTpMFiBXW9BnEOGyy4cNDy3T2FRteosCIkcM+sx wwrVlMdb/6TOYoQUlBJRaEAakEfhBP53+ZQ+PbpHbM0ka7lGHgQbIOkCTBCoP6KCbeJgdP 1H1lfaXkU2KQuAuOwIjlStaCAyml/TBoFYSqv6wNBmjxpkkBVaaQUXC05VkCzA== 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 4YLBPd4j7Hzchh; Sat, 28 Dec 2024 18:55:01 +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 4BSIt1mJ037734; Sat, 28 Dec 2024 18:55:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSIt1MQ037730; Sat, 28 Dec 2024 18:55:01 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:55:01 GMT Message-Id: <202412281855.4BSIt1MQ037730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: f6222e8e816c - stable/13 - linux.h: don't redefine lower_32_bits if already defined List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f6222e8e816cf12d54117fb2d175738bb21f2d25 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f6222e8e816cf12d54117fb2d175738bb21f2d25 commit f6222e8e816cf12d54117fb2d175738bb21f2d25 Author: Warner Losh AuthorDate: 2024-10-15 04:53:55 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:15:53 +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 efa49af3cca8..b9e176f449c1 100644 --- a/sys/compat/linux/linux.h +++ b/sys/compat/linux/linux.h @@ -348,7 +348,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) \