svn commit: r326304 - stable/11/sys/vm

[Mark Johnston]

Author: markj
Date: Tue Nov 28 01:15:10 2017
New Revision: 326304
URL: https://svnweb.freebsd.org/changeset/base/326304

Log:
  MFC r326055:
  Allow for fictitious physical pages in vm_page_scan_contig().

Modified:
  stable/11/sys/vm/vm_page.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/vm/vm_page.c
==============================================================================
--- stable/11/sys/vm/vm_page.c	Tue Nov 28 00:56:20 2017	(r326303)
+++ stable/11/sys/vm/vm_page.c	Tue Nov 28 01:15:10 2017	(r326304)
@@ -2036,8 +2036,10 @@ vm_page_scan_contig(u_long npages, vm_page_t m_start, 
 	run_len = 0;
 	m_mtx = NULL;
 	for (m = m_start; m < m_end && run_len < npages; m += m_inc) {
-		KASSERT((m->flags & (PG_FICTITIOUS | PG_MARKER)) == 0,
-		    ("page %p is PG_FICTITIOUS or PG_MARKER", m));
+		KASSERT((m->flags & PG_MARKER) == 0,
+		    ("page %p is PG_MARKER", m));
+		KASSERT((m->flags & PG_FICTITIOUS) == 0 || m->wire_count == 1,
+		    ("fictitious page %p has invalid wire count", m));
 
 		/*
 		 * If the current page would be the start of a run, check its