Date: Tue, 21 Apr 2026 22:27:16 +0000 From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron <dumbbell@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: bbd20c0795a7 - main - linuxkpi: Pass a `const void *` to `krealloc()` Message-ID: <69e7f9c4.380e9.64573d5c@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=bbd20c0795a7df35fc665165bf5f17d7f6533e54 commit bbd20c0795a7df35fc665165bf5f17d7f6533e54 Author: Jean-Sébastien Pédron <dumbbell@FreeBSD.org> AuthorDate: 2026-04-13 23:59:09 +0000 Commit: Jean-Sébastien Pédron <dumbbell@FreeBSD.org> CommitDate: 2026-04-21 22:18:26 +0000 linuxkpi: Pass a `const void *` to `krealloc()` This matches the API on Linux. Reviewed by: bz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56451 --- sys/compat/linuxkpi/common/include/linux/slab.h | 4 ++-- sys/compat/linuxkpi/common/src/linux_slab.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/slab.h b/sys/compat/linuxkpi/common/include/linux/slab.h index 6c05c77819a5..8d023eaddadd 100644 --- a/sys/compat/linuxkpi/common/include/linux/slab.h +++ b/sys/compat/linuxkpi/common/include/linux/slab.h @@ -120,7 +120,7 @@ void *lkpi_kmalloc(size_t, gfp_t); void *lkpi_kvmalloc(size_t, gfp_t); void *lkpi___kmalloc(size_t, gfp_t); void *lkpi___kmalloc_node(size_t, gfp_t, int); -void *lkpi_krealloc(void *, size_t, gfp_t); +void *lkpi_krealloc(const void *, size_t, gfp_t); void lkpi_kfree(const void *); static inline gfp_t @@ -166,7 +166,7 @@ kmalloc_node(size_t size, gfp_t flags, int node) kmalloc(size_mul((_n) * sizeof(typeof(_p))), default_gfp(__VA_ARGS__)) static inline void * -krealloc(void *ptr, size_t size, gfp_t flags) +krealloc(const void *ptr, size_t size, gfp_t flags) { return (lkpi_krealloc(ptr, size, flags)); } diff --git a/sys/compat/linuxkpi/common/src/linux_slab.c b/sys/compat/linuxkpi/common/src/linux_slab.c index 6f71d17a3770..96fe74dcd40d 100644 --- a/sys/compat/linuxkpi/common/src/linux_slab.c +++ b/sys/compat/linuxkpi/common/src/linux_slab.c @@ -239,7 +239,7 @@ lkpi___kmalloc(size_t size, gfp_t flags) } void * -lkpi_krealloc(void *ptr, size_t size, gfp_t flags) +lkpi_krealloc(const void *ptr, size_t size, gfp_t flags) { void *nptr; size_t osize; @@ -252,7 +252,7 @@ lkpi_krealloc(void *ptr, size_t size, gfp_t flags) osize = ksize(ptr); if (size <= osize) - return (ptr); + return (__DECONST(void *, ptr)); /* * We know the new size > original size. realloc(9) does not (and cannot) @@ -262,7 +262,7 @@ lkpi_krealloc(void *ptr, size_t size, gfp_t flags) * backing. */ if (size <= PAGE_SIZE) - return (realloc(ptr, size, M_KMALLOC, linux_check_m_flags(flags))); + return (realloc(__DECONST(void *, ptr), size, M_KMALLOC, linux_check_m_flags(flags))); nptr = kmalloc(size, flags); if (nptr == NULL)home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e7f9c4.380e9.64573d5c>