svn commit: r309734 - head/sys/compat/linuxkpi/common/include/linux
Hans Petter Selasky
hselasky at FreeBSD.org
Fri Dec 9 14:06:24 UTC 2016
Author: hselasky
Date: Fri Dec 9 14:06:22 2016
New Revision: 309734
URL: https://svnweb.freebsd.org/changeset/base/309734
Log:
Avoid malloc() warnings when using the LinuxKPI by zero-checking
the allocation flags.
Obtained from: kmacy @
Sponsored by: Mellanox Technologies
MFC after: 1 week
Modified:
head/sys/compat/linuxkpi/common/include/linux/gfp.h
head/sys/compat/linuxkpi/common/include/linux/slab.h
Modified: head/sys/compat/linuxkpi/common/include/linux/gfp.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/gfp.h Fri Dec 9 13:53:31 2016 (r309733)
+++ head/sys/compat/linuxkpi/common/include/linux/gfp.h Fri Dec 9 14:06:22 2016 (r309734)
@@ -64,7 +64,7 @@
#define GFP_IOFS M_NOWAIT
#define GFP_NOIO M_NOWAIT
#define GFP_DMA32 0
-#define GFP_TEMPORARY 0
+#define GFP_TEMPORARY M_NOWAIT
static inline void *
page_address(struct page *page)
Modified: head/sys/compat/linuxkpi/common/include/linux/slab.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/slab.h Fri Dec 9 13:53:31 2016 (r309733)
+++ head/sys/compat/linuxkpi/common/include/linux/slab.h Fri Dec 9 14:06:22 2016 (r309734)
@@ -43,7 +43,7 @@ MALLOC_DECLARE(M_KMALLOC);
#define kmalloc(size, flags) malloc((size), M_KMALLOC, (flags))
#define kvmalloc(size) kmalloc((size), 0)
-#define kzalloc(size, flags) kmalloc((size), (flags) | M_ZERO)
+#define kzalloc(size, flags) kmalloc((size), M_ZERO | ((flags) ? (flags) : M_NOWAIT))
#define kzalloc_node(size, flags, node) kzalloc(size, flags)
#define kfree(ptr) free(__DECONST(void *, (ptr)), M_KMALLOC)
#define kfree_const(ptr) kfree(ptr)
More information about the svn-src-all
mailing list