svn commit: r243131 - head/sys/vm

Konstantin Belousov kib at FreeBSD.org
Fri Nov 16 05:49:56 UTC 2012


Author: kib
Date: Fri Nov 16 05:49:56 2012
New Revision: 243131
URL: http://svnweb.freebsd.org/changeset/base/243131

Log:
  Explicitely state that M_USE_RESERVE requires M_NOWAIT, using assertion.
  
  Reviewed by:	alc
  MFC after:	2 weeks

Modified:
  head/sys/vm/vm_page.h

Modified: head/sys/vm/vm_page.h
==============================================================================
--- head/sys/vm/vm_page.h	Fri Nov 16 04:25:35 2012	(r243130)
+++ head/sys/vm/vm_page.h	Fri Nov 16 05:49:56 2012	(r243131)
@@ -353,6 +353,9 @@ malloc2vm_flags(int malloc_flags)
 {
 	int pflags;
 
+	KASSERT((malloc_flags & M_USE_RESERVE) == 0 ||
+	    (malloc_flags & M_NOWAIT) != 0,
+	    ("M_USE_RESERVE requires M_NOWAIT"));
 	pflags = (malloc_flags & M_USE_RESERVE) != 0 ? VM_ALLOC_INTERRUPT :
 	    VM_ALLOC_SYSTEM;
 	if ((malloc_flags & M_ZERO) != 0)


More information about the svn-src-head mailing list