svn commit: r282250 - head/sys/sys

[Mariusz Zaborski]

Author: oshogbo
Date: Wed Apr 29 22:00:26 2015
New Revision: 282250
URL: https://svnweb.freebsd.org/changeset/base/282250

Log:
  Nvlist functionality is not used within interrupt context, so we should
  use M_WAITOK to allocate memory.
  
  Approved by:	pjd (mentor)

Modified:
  head/sys/sys/nv_impl.h

Modified: head/sys/sys/nv_impl.h
==============================================================================
--- head/sys/sys/nv_impl.h	Wed Apr 29 21:54:34 2015	(r282249)
+++ head/sys/sys/nv_impl.h	Wed Apr 29 22:00:26 2015	(r282250)
@@ -47,11 +47,11 @@ typedef struct nvpair nvpair_t;
 #define	NV_FLAG_BIG_ENDIAN		0x80
 
 #ifdef _KERNEL
-#define	nv_malloc(size)			malloc((size), M_NVLIST, M_NOWAIT)
+#define	nv_malloc(size)			malloc((size), M_NVLIST, M_WAITOK)
 #define	nv_calloc(n, size)		malloc((n) * (size), M_NVLIST, \
-					    M_NOWAIT | M_ZERO)
+					    M_WAITOK | M_ZERO)
 #define	nv_realloc(buf, size)		realloc((buf), (size), M_NVLIST, \
-					    M_NOWAIT)
+					    M_WAITOK)
 #define	nv_free(buf)			free((buf), M_NVLIST)
 #define	nv_strdup(buf)			strdup((buf), M_NVLIST)
 #define	nv_vasprintf(ptr, ...)		vasprintf(ptr, M_NVLIST, __VA_ARGS__)