Date: Tue, 10 Feb 2026 03:11:27 +0200 From: Konstantin Belousov <kostikbel@gmail.com> To: "Bjoern A. Zeeb" <bz@freebsd.org> Cc: Brooks Davis <brooks@freebsd.org>, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: ad639400dc9f - main - sys/event.h: use freebsd32_uint64_t for kevent32 64bit members Message-ID: <aYqFvy_B7YDP7Ola@kib.kiev.ua> In-Reply-To: <0qrpp6r-1374-7r1s-8o3o-9280q483q549@mnoonqbm.arg> References: <698a3052.36544.6d7c1a7c@gitrepo.freebsd.org> <0qrpp6r-1374-7r1s-8o3o-9280q483q549@mnoonqbm.arg>
index | next in thread | previous in thread | raw e-mail
On Tue, Feb 10, 2026 at 12:42:24AM +0000, Bjoern A. Zeeb wrote: > On Mon, 9 Feb 2026, Konstantin Belousov wrote: > > Hi, > > > The branch main has been updated by kib: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=ad639400dc9f1c5aec470996473bb54edc113dba > > > > commit ad639400dc9f1c5aec470996473bb54edc113dba > > Author: Konstantin Belousov <kib@FreeBSD.org> > > AuthorDate: 2026-02-05 19:22:44 +0000 > > Commit: Konstantin Belousov <kib@FreeBSD.org> > > CommitDate: 2026-02-09 18:57:19 +0000 > > > > sys/event.h: use freebsd32_uint64_t for kevent32 64bit members > > > > Reviewed by: brooks > > Sponsored by: The FreeBSD Foundation > > MFC after: 1 week > > Differential revision: https://reviews.freebsd.org/D55135 > > It seems that this commit breaks drm-kmod radeon drivers at least. > > I assume given the abi_compat.h now gets exposed via event.h into > LinuxKPI and "CP2" etc. are just very generic names. I already created https://reviews.freebsd.org/D55202 > > > 26 In file included from /home/bz/local_modules_dir/drm-kmod/drivers/gpu/drm/radeon/ci_dpm.c:31: > 27 /home/bz/local_modules_dir/drm-kmod/drivers/gpu/drm/radeon/cikd.h:852:10: error: 'CP2' macro redefined [-Werror,-Wmacro-redefined] > 28 852 | #define CP2 (1 << 2) > 29 | ^ > 30 /home/bz/git/FreeBSD/freebsd-src/sys/sys/abi_compat.h:73:9: note: previous definition is here > 31 73 | #define CP2(src, dst, sfld, dfld) do { \ > 32 | ^ > 33 1 error generated. > > > > --- > > sys/compat/freebsd32/freebsd32_misc.c | 38 ++++++----------------------------- > > sys/sys/event.h | 6 ++++-- > > usr.bin/kdump/kdump.c | 6 +----- > > 3 files changed, 11 insertions(+), 39 deletions(-) > > > ... > ... > ... > > diff --git a/sys/sys/event.h b/sys/sys/event.h > > index ebbcdb703183..0ba8e4796208 100644 > > --- a/sys/sys/event.h > > +++ b/sys/sys/event.h > > @@ -104,6 +104,8 @@ struct freebsd11_kevent { > > #endif > > > > #if defined(_WANT_KEVENT32) || defined(_KERNEL) > > +#include <sys/abi_compat.h> > > + > > struct kevent32 { > > __uint32_t ident; /* identifier for this event */ > > short filter; /* filter for event */ > ... > > -- > Bjoern A. Zeeb r15:7home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?aYqFvy_B7YDP7Ola>