Date: Wed, 23 Apr 2025 16:36:10 GMT From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: cd649cfc7ab2 - main - LinuxKPI: skbuff: re-add __LP64__ check Message-ID: <202504231636.53NGaANs001226@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cd649cfc7ab23a8a36218977c60ed20afe48aea9 commit cd649cfc7ab23a8a36218977c60ed20afe48aea9 Author: Bjoern A. Zeeb <bz@FreeBSD.org> AuthorDate: 2025-04-23 16:31:04 +0000 Commit: Bjoern A. Zeeb <bz@FreeBSD.org> CommitDate: 2025-04-23 16:31:04 +0000 LinuxKPI: skbuff: re-add __LP64__ check Re-add one __LP64__ check for case 2 (36bit upper limit to contigmalloc) to fix the build. contigmalloc(9) takes a vm_paddr_t argument but on armv7 and some powerpc we are still at 32bit there so the constant value would be changed from long long to uint (-Wconstant-conversion). Sponsored by: The FreeBSD Foundation MFC after: 3 days Reported by: CI Fixes: e6c91f8e5be66 --- sys/compat/linuxkpi/common/src/linux_skbuff.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_skbuff.c b/sys/compat/linuxkpi/common/src/linux_skbuff.c index 2fea4d69b844..abfb642ba708 100644 --- a/sys/compat/linuxkpi/common/src/linux_skbuff.c +++ b/sys/compat/linuxkpi/common/src/linux_skbuff.c @@ -116,9 +116,11 @@ linuxkpi_alloc_skb(size_t size, gfp_t gfp) vm_paddr_t high; switch (linuxkpi_skb_memlimit) { +#ifdef __LP64__ case 2: high = (0xfffffffff); /* 1<<36 really. */ break; +#endif case 1: default: high = (0xffffffff); /* 1<<32 really. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202504231636.53NGaANs001226>