From nobody Mon Apr 07 01:29:14 2025 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 4ZWBSq2lCqz5sNm2; Mon, 07 Apr 2025 01:29:15 +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 4ZWBSp5Rvrz3wh8; Mon, 07 Apr 2025 01:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743989354; 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=dbrOK5K5A4jmrqRBTq9qyQxTFsOfmlYh7A77nILexQY=; b=nr9/5AMXg/FbepsoGrm8g6s2JLEKPTxjXwfNDWaMXgU0XjxsuMOXdXrKBKP1m1lHpNGsPr r4r4P3tls1Ymg3DgQnkBEhwi4wfSj7HRf9C9OmpkmsA6deue8gXEfd3UDJGHxVQ4aX6DvF dFpNWUHkOU+rV1cpkcuScgzIont0wrBvJ2dcFYxSbN6D9m3J4JmofutIInCaddvHv4Q+SQ bnHyrzPMF7T+61WpNTn7jfKnfv82gxSCzE7dU2Thto9Y+M1qyiDnJ4XqRlgJAiCb8+g+y5 Jt28YFYEmTqeCqL/uokoTcqs3MUvPIRA3/BJLBZK6lN7O/tlHF6VWBgQgkKDRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743989354; a=rsa-sha256; cv=none; b=DnRjOOglb92ZtAh46XgUCWoaL5GViHQULi9Ts1ca/oNGZO241EFUeTTSDH5BKsuBEBnnzN yZY5+wEN+V43aNUwB5uONXPZhHDYQM9Tidp9pfMAja4o70Z0k9BVr7AF+KBlQ1QQ4MUggM q+77e6m5/BBs9SVh1SFrb3ZUFNxFGMRU6YHRUGr8Kf/vC4wfwZzOQx2zBocqXX8cYVS3WJ gTsMBrzdhgqvamANOEux+Sd9Xr+4TREkzcU41CmjUEO+vo+huCYbc6y0diViz5RnHhy510 HqoQVEjEPMkllb+6hP9HBeAWUZvX5l7lRzVaSDTRhoYc5ljxT6YpIv13ooc3FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743989354; 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=dbrOK5K5A4jmrqRBTq9qyQxTFsOfmlYh7A77nILexQY=; b=NcxVJD1PCPwrFWIUuJgGPbb05RFxHSDBjk9zw/mN7TDYQGNyEYMD2b6SeVV8dS7ZxAK0Xd iaBtkmsGEQ63KN63jhtWVf1cQYfTk28mOe4oBrhuqOSbk1EhB0YwZTRL3Qa7EApRygvYSX ppGTKnrYp/cWZpvaar/JZ3pcqcIj+qxlGNwgZkvTTrRNxFE/Up/b8PlgUdhn6d19FX7vxa rFdnxJL6WBJPqAx2hSY/15MrTq7zqL78OjNaY2W9xDcVIPfrvAWhWMMYgL+vgAA7QlNnKu gisgLTB4G01UQM74X4EV26ByBt/i+pOnWHCT0q1sXYyO2HeTgJUopy9fDyguQg== 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 4ZWBSp51f6z956; Mon, 07 Apr 2025 01:29:14 +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 5371TEYL063362; Mon, 7 Apr 2025 01:29:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5371TEuh063359; Mon, 7 Apr 2025 01:29:14 GMT (envelope-from git) Date: Mon, 7 Apr 2025 01:29:14 GMT Message-Id: <202504070129.5371TEuh063359@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 78f7ec2bc5f9 - stable/14 - freebsd32/freebsd32.h: only define kinfo_knote32 when kevent32 is 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 78f7ec2bc5f9136e55cef6012d95bfa167af2803 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=78f7ec2bc5f9136e55cef6012d95bfa167af2803 commit 78f7ec2bc5f9136e55cef6012d95bfa167af2803 Author: Konstantin Belousov AuthorDate: 2025-03-24 04:06:24 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-07 01:28:22 +0000 freebsd32/freebsd32.h: only define kinfo_knote32 when kevent32 is defined (cherry picked from commit a6ea60aa48878d2d0c113f541fb2b9b8246ac06b) --- sys/compat/freebsd32/freebsd32.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index c3234141d5a9..3a4625b8e2d3 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -446,6 +446,7 @@ struct kinfo_vm_layout32 { uint32_t kvm_spare[12]; }; +#if defined(_WANT_KEVENT32) || (defined(_KERNEL) && defined(__LP64__)) struct kinfo_knote32 { int knt_kq_fd; struct kevent32 knt_event; @@ -464,6 +465,7 @@ struct kinfo_knote32 { } knt_pipe; }; }; +#endif struct kld_file_stat_1_32 { int version; /* set to sizeof(struct kld_file_stat_1) */