svn commit: r331424 - user/markj/vm-playground/sys/vm

[Mark Johnston]

Author: markj
Date: Fri Mar 23 14:36:24 2018
New Revision: 331424
URL: https://svnweb.freebsd.org/changeset/base/331424

Log:
  Fix a mismerge that resulted in a page leak.

Modified:
  user/markj/vm-playground/sys/vm/vm_page.c

Modified: user/markj/vm-playground/sys/vm/vm_page.c
==============================================================================
--- user/markj/vm-playground/sys/vm/vm_page.c	Fri Mar 23 14:34:41 2018	(r331423)
+++ user/markj/vm-playground/sys/vm/vm_page.c	Fri Mar 23 14:36:24 2018	(r331424)
@@ -3680,7 +3680,6 @@ vm_page_free_toq(vm_page_t m)
 		return;
 
 	domain = vm_phys_domain(m);
-	freed = 0;
 	vmd = VM_DOMAIN(domain);
 
 	critical_enter();
@@ -3694,6 +3693,8 @@ vm_page_free_toq(vm_page_t m)
 	critical_exit();
 
 	vm_domain_free_lock(vmd);
+	vm_phys_free_pages(m, 0);
+	freed = 1;
 	VM_BATCHQ_FOREACH(&bq, m) {
 		vm_phys_free_pages(m, 0);
 		freed++;