Page MenuHomeFreeBSD
Files F153892780

D56451.id175718.diff
No OneTemporary
Actions

D56451.id175718.diff
View Options

Index: sys/compat/linuxkpi/common/include/linux/slab.h
===================================================================
--- sys/compat/linuxkpi/common/include/linux/slab.h
+++ sys/compat/linuxkpi/common/include/linux/slab.h
@@ -104,7 +104,7 @@
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
@@ -144,7 +144,7 @@
}
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));
}
Index: sys/compat/linuxkpi/common/src/linux_slab.c
===================================================================
--- sys/compat/linuxkpi/common/src/linux_slab.c
+++ sys/compat/linuxkpi/common/src/linux_slab.c
@@ -239,7 +239,7 @@
}
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 @@
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 @@
* 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)

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 25, 2:17 PM (4 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32129384
Default Alt Text
D56451.id175718.diff (1 KB)

Event Timeline