From nobody Mon Mar 24 05:45:16 2025 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 4ZLhpy3yWSz5rQfW for ; Mon, 24 Mar 2025 05:45:30 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZLhpy08vBz3Qqd for ; Mon, 24 Mar 2025 05:45:29 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-399744f74e9so2304460f8f.1 for ; Sun, 23 Mar 2025 22:45:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742795128; x=1743399928; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Zb5ZlYU8E+UfBJpyeOG+V6idyJYTsXu74n1XH87jgyo=; b=OQYUWkY5BVklIbV4LeaNl//H5u02DAeLXCNfXAPnZ4288iUTRP9PdA2wXRPoBmmQCl o9tDsF6f2M7OTBLf8MnUFEf1dRVHj3icPfi5BRmcVxENbWPpSTES7qZSNgKL3dDk8sE0 9KzhO1EEsVaj192V0rdVuSb2dVdfhowNHg/ZaqWQjXPfTrTDVsYjx47NmmmYkvLQDue0 qUxr0VuyJ1F2ni3XoBzQFxqeqB1+JSOPb0bAdlGIP2C2HzEwKtH6bmZUM+Vi39sfpm4C 5aQv+4RliEq+5tiCddjXIUFMcjLo0ONWEV1VjU457+Q+lOl6VaSNDA/XcmvotwboVqez qp9g== X-Forwarded-Encrypted: i=1; AJvYcCUl/ryQgkSNnCJ0QP05xjqS+WFpGRBM9grl5rH/tVuzUX1x/NYej2L+Zmi61Qstn/j3ueZjeYLE92lBDEDhpvaZP8/vrw==@freebsd.org X-Gm-Message-State: AOJu0YxmCUDB+ntO0b+q6OMtNkkpGWvIwoPJDp8CpcqzlQpTowrD+CEQ 8qL14ai9u2Q87LO9Zbv08R5hlN3druvPTEOVBMoDJgCw1juUbD0qPbw+U3t80t8= X-Gm-Gg: ASbGncsgW6usiHZzbEo0kqXIFVWsLyXAHtTEuB2+NQG6N3P1rtYwSevw3UyOVOLAoKC TtQpvM5e6IBS7lG87wri4KyUz2E4BlVQRLL7Zhcmr4FUzgh3xamlE3182NqugrZclDCONFXW9jQ hXMcTmMENrE+OQQQxyG/vgnLLfFox1k1Q4767r+titR9UsqFMaSo5rrvRTAyPuxRKRLgco+8Nv4 e7fNpOwUOVTAVRk5sgWdaCMzfscWDH7+gCLIt2i6FME57KDj+CQ5AloD1GEDrtmwarGjSPaLCGc 0vRM1uORUP08N9BKHPo6HxlMUIkbaaIS9NFj97REG5L6VEiMTwuTFF3OVXLeRAolyp2QvA== X-Google-Smtp-Source: AGHT+IGCKY3We6sTpfiR69ngrc7rR4Z+axKMlN/IWkf1K1HsC8tFoEBlbrrCIiJH/A/rImllaIReKg== X-Received: by 2002:a5d:6d81:0:b0:391:29c0:83f5 with SMTP id ffacd0b85a97d-3997f94da3bmr9749968f8f.44.1742795127499; Sun, 23 Mar 2025 22:45:27 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d43fdab7asm160191255e9.29.2025.03.23.22.45.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Mar 2025 22:45:27 -0700 (PDT) Content-Type: text/plain; charset=utf-8 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 (Mac OS X Mail 16.0 \(3826.300.87.4.3\)) Subject: Re: git: a6ea60aa4887 - main - freebsd32/freebsd32.h: only define kinfo_knote32 when kevent32 is defined From: Jessica Clarke In-Reply-To: <202503240407.52O47Sk3059876@gitrepo.freebsd.org> Date: Mon, 24 Mar 2025 05:45:16 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <24EE84A5-EED2-46A4-A6BF-137DE982833B@freebsd.org> References: <202503240407.52O47Sk3059876@gitrepo.freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3826.300.87.4.3) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4ZLhpy08vBz3Qqd X-Spamd-Bar: ---- On 24 Mar 2025, at 04:07, Konstantin Belousov wrote: >=20 > The branch main has been updated by kib: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Da6ea60aa48878d2d0c113f541fb2b9b8= 246ac06b >=20 > commit a6ea60aa48878d2d0c113f541fb2b9b8246ac06b > Author: Konstantin Belousov > AuthorDate: 2025-03-24 04:06:24 +0000 > Commit: Konstantin Belousov > CommitDate: 2025-03-24 04:06:24 +0000 >=20 > freebsd32/freebsd32.h: only define kinfo_knote32 when kevent32 is = defined >=20 > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > --- > sys/compat/freebsd32/freebsd32.h | 2 ++ > 1 file changed, 2 insertions(+) >=20 > 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]; > }; >=20 > +#if defined(_WANT_KEVENT32) || (defined(_KERNEL) && = defined(__LP64__)) Please don=E2=80=99t use __LP64__ to mean =E2=80=9Cnot 32-bit=E2=80=9D. = Other ABIs exist downstream. Is there a reason the RHS of the || isn=E2=80=99t just = defined(COMPAT_FREEBSD32)? Jess > struct kinfo_knote32 { > int knt_kq_fd; > struct kevent32 knt_event; > @@ -464,6 +465,7 @@ struct kinfo_knote32 { > } knt_pipe; > }; > }; > +#endif >=20 > struct kld_file_stat_1_32 { > int version; /* set to sizeof(struct kld_file_stat_1) */