Date: Mon, 24 Mar 2025 05:45:16 +0000 From: Jessica Clarke <jrtc27@freebsd.org> To: Konstantin Belousov <kib@FreeBSD.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: a6ea60aa4887 - main - freebsd32/freebsd32.h: only define kinfo_knote32 when kevent32 is defined Message-ID: <24EE84A5-EED2-46A4-A6BF-137DE982833B@freebsd.org> In-Reply-To: <202503240407.52O47Sk3059876@gitrepo.freebsd.org> References: <202503240407.52O47Sk3059876@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 24 Mar 2025, at 04:07, Konstantin Belousov <kib@FreeBSD.org> 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 <kib@FreeBSD.org> > AuthorDate: 2025-03-24 04:06:24 +0000 > Commit: Konstantin Belousov <kib@FreeBSD.org> > 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) */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?24EE84A5-EED2-46A4-A6BF-137DE982833B>