From nobody Tue Oct 15 10:50:42 2024 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 4XSW8z0CVfz5YlF6; Tue, 15 Oct 2024 10:50:43 +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 4XSW8y6m23z4W73; Tue, 15 Oct 2024 10:50:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728989442; 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=udGXI61t0LMa/f+VHu8iKazvsgtISSBqsLMiNiKxKi0=; b=DtLSf1402PrkkBRUE3J7aoVSLlhoYOqsdBnMZJZVNkD4wugZKmwROgBgNWDfxQAt+X0YgZ eMAarXXUV1znEQq3VTvirFUUI2lGjMP1SXXSC/99OZ4VKtx9akKi+rRiTkSnvXgQ9+Nl1p 6FDI2THYgGoOwQkY0E/txIxSWmvT9vUP0gvyx9YfJs47IpVPL2UCChAluZvb+2nKjkgQiH ByJZt2ZkZpKcUpa1UcVNUFxAHxs3lvsIQbmdnjxKnfon5jz/8KWXzFs6QuCf9scuJpe8UK q/V9vqAdsg5zcqr85ICHWvVZApFAS6l8eSJeD0DkWt1BjnvNXs2nqLAXo0Gjqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728989442; 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=udGXI61t0LMa/f+VHu8iKazvsgtISSBqsLMiNiKxKi0=; b=bfnYKC4gSgkjusSEQLANyBU0EwV4QuHvbn9DJSmDxFOCeSGuN5mV/gExPfcbpFdFsSo2dF +Zo7uNkm0lf7BfDhHIYYgGhL1cOalLhLSsSmT0jimkeorPtl9dwfgcy6Bd53HfQ3/tKhp2 HKyEx+tZE+2cnyNSaWO9lThJk78WWTjSTU3bBRO+9Iw7kP9XRHdj/owTRt9V3bhumheyUR tep31cqZok4J9XQkWWc9sLQLWeCgggyV+tJj+pCFlI+CLwhzqzbo/Runwm8f9tCKpruGts 5BILCebgew1kPSwrtgUsUy2Jl7ydubzh1nUxL0UIs4Cx/wVU8Ht6DmJ1XhI2sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728989442; a=rsa-sha256; cv=none; b=YFVi9DZi+hwdTHaDZIqUiAPHqV0LfKOg/RfMd9nGItJV9TOBuWDPdZv06ZgFXahfTIimQT qVgqRen5pi29NsJG43m+Pc6vTbvNRX3DKXWWTgMlW3xyxgQS9F/wL6r/dBvGLGAuTmDh4x vKabbWGBnc7/R7v3xnT5KA8Lb9Rvz/pPGjgM7h7+G87tHl2WkicB2B9Bqjyoeleib9H37g MRHEeU56//NOwzbFbGTkl8Rk+6unwJwAOhEEnmjQQQhRcOiObnSDLJAfAgIRrpMHRbUCyp wgTcdtbhjh6FFv1uYTWe+NOWBZZP+EQAE/j4q3cyA+Pcb0uKRYZhpVjZXZKc2Q== 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 4XSW8y6DZDzJmG; Tue, 15 Oct 2024 10:50:42 +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 49FAog5f055249; Tue, 15 Oct 2024 10:50:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49FAogFa055246; Tue, 15 Oct 2024 10:50:42 GMT (envelope-from git) Date: Tue, 15 Oct 2024 10:50:42 GMT Message-Id: <202410151050.49FAogFa055246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 481d5a489164 - main - linux.h: don't redefine lower_32_bits if already defined 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 481d5a4891648f0a6979a48689cc16fca80d4ab6 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=481d5a4891648f0a6979a48689cc16fca80d4ab6 commit 481d5a4891648f0a6979a48689cc16fca80d4ab6 Author: Warner Losh AuthorDate: 2024-10-15 04:53:55 +0000 Commit: Warner Losh CommitDate: 2024-10-15 10:50:44 +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 --- 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) \