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

[Mark Johnston]

Author: markj
Date: Sun Mar 25 18:10:00 2018
New Revision: 331535
URL: https://svnweb.freebsd.org/changeset/base/331535

Log:
  Merge from user/jeff/numa.

Modified:
  user/markj/vm-playground/sys/vm/vm_page.c
Directory Properties:
  user/markj/vm-playground/   (props changed)

Modified: user/markj/vm-playground/sys/vm/vm_page.c
==============================================================================
--- user/markj/vm-playground/sys/vm/vm_page.c	Sun Mar 25 17:12:09 2018	(r331534)
+++ user/markj/vm-playground/sys/vm/vm_page.c	Sun Mar 25 18:10:00 2018	(r331535)
@@ -3922,8 +3922,12 @@ vm_page_launder(vm_page_t m)
 	if (m->wire_count > 0 || (m->oflags & VPO_UNMANAGED) != 0)
 		return;
 
-	vm_page_remque(m);
-	vm_page_enqueue_lazy(m, PQ_LAUNDRY);
+	if (m->queue == PQ_LAUNDRY)
+		vm_page_requeue(m);
+	else {
+		vm_page_remque(m);
+		vm_page_enqueue_lazy(m, PQ_LAUNDRY);
+	}
 }
 
 /*