svn commit: r243366 - head/sys/vm

[Alan Cox]

Author: alc
Date: Wed Nov 21 06:26:18 2012
New Revision: 243366
URL: http://svnweb.freebsd.org/changeset/base/243366

Log:
  Correct an error in r230623.  When both VM_ALLOC_NODUMP and VM_ALLOC_ZERO
  were specified to vm_page_alloc(), PG_NODUMP wasn't being set on the
  allocated page when it happened to be pre-zeroed.
  
  MFC after:	5 days

Modified:
  head/sys/vm/vm_page.c

Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c	Wed Nov 21 04:54:02 2012	(r243365)
+++ head/sys/vm/vm_page.c	Wed Nov 21 06:26:18 2012	(r243366)
@@ -1481,13 +1481,13 @@ vm_page_alloc(vm_object_t object, vm_pin
 	 * must be cleared before the free page queues lock is released.
 	 */
 	flags = 0;
-	if (req & VM_ALLOC_NODUMP)
-		flags |= PG_NODUMP;
 	if (m->flags & PG_ZERO) {
 		vm_page_zero_count--;
 		if (req & VM_ALLOC_ZERO)
 			flags = PG_ZERO;
 	}
+	if (req & VM_ALLOC_NODUMP)
+		flags |= PG_NODUMP;
 	m->flags = flags;
 	mtx_unlock(&vm_page_queue_free_mtx);
 	m->aflags = 0;