Date: Sat, 28 Dec 2024 18:55:01 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: f6222e8e816c - stable/13 - linux.h: don't redefine lower_32_bits if already defined Message-ID: <202412281855.4BSIt1MQ037730@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f6222e8e816cf12d54117fb2d175738bb21f2d25 commit f6222e8e816cf12d54117fb2d175738bb21f2d25 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2024-10-15 04:53:55 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2024-12-28 18:15:53 +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 (cherry picked from commit 481d5a4891648f0a6979a48689cc16fca80d4ab6) --- 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 efa49af3cca8..b9e176f449c1 100644 --- a/sys/compat/linux/linux.h +++ b/sys/compat/linux/linux.h @@ -348,7 +348,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) \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412281855.4BSIt1MQ037730>