diff options
Diffstat (limited to 'sys/compat/linuxkpi/common/include/linux')
| -rw-r--r-- | sys/compat/linuxkpi/common/include/linux/slab.h | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/sys/compat/linuxkpi/common/include/linux/slab.h b/sys/compat/linuxkpi/common/include/linux/slab.h index 8d023eaddadd..b529a6303085 100644 --- a/sys/compat/linuxkpi/common/include/linux/slab.h +++ b/sys/compat/linuxkpi/common/include/linux/slab.h @@ -141,6 +141,13 @@ linux_check_m_flags(gfp_t flags) /* * Base functions with a native implementation. */ + +static inline size_t +ksize(const void *ptr) +{ + return (malloc_usable_size(ptr)); +} + static inline void * kmalloc(size_t size, gfp_t flags) { @@ -264,22 +271,28 @@ kvmalloc_array(size_t n, size_t size, gfp_t flags) return (kvmalloc(size * n, flags)); } +void * lkpi_kvrealloc(const void *ptr, size_t oldsize, size_t newsize, gfp_t flags); + +#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION < 61200 static inline void * kvrealloc(const void *ptr, size_t oldsize, size_t newsize, gfp_t flags) { - void *newptr; - - if (newsize <= oldsize) - return (__DECONST(void *, ptr)); + return (lkpi_kvrealloc(ptr, oldsize, newsize, flags)); +} +#else +static inline void * +kvrealloc(const void *ptr, size_t newsize, gfp_t flags) +{ + size_t oldsize; - newptr = kvmalloc(newsize, flags); - if (newptr != NULL) { - memcpy(newptr, ptr, oldsize); - kvfree(ptr); - } + if (!ZERO_OR_NULL_PTR(ptr)) + oldsize = ksize(ptr); + else + oldsize = 0; - return (newptr); + return (lkpi_kvrealloc(ptr, oldsize, newsize, flags)); } +#endif /* * Misc. @@ -295,12 +308,6 @@ kfree_sensitive(const void *ptr) } static inline size_t -ksize(const void *ptr) -{ - return (malloc_usable_size(ptr)); -} - -static inline size_t kmalloc_size_roundup(size_t size) { if (unlikely(size == 0 || size == SIZE_MAX)) |