svn commit: r336008 - in head/sys: amd64/amd64 i386/i386

[Konstantin Belousov]

Author: kib
Date: Thu Jul  5 17:26:13 2018
New Revision: 336008
URL: https://svnweb.freebsd.org/changeset/base/336008

Log:
  Revert r335999 to re-commit with the correct error message.

Modified:
  head/sys/amd64/amd64/pmap.c
  head/sys/i386/i386/pmap.c

Modified: head/sys/amd64/amd64/pmap.c
==============================================================================
--- head/sys/amd64/amd64/pmap.c	Thu Jul  5 17:13:37 2018	(r336007)
+++ head/sys/amd64/amd64/pmap.c	Thu Jul  5 17:26:13 2018	(r336008)
@@ -2308,6 +2308,7 @@ retry:
 				    PG_PS_FRAME) | (va & PDRMASK), &pa))
 					goto retry;
 				m = PHYS_TO_VM_PAGE(pa);
+				vm_page_hold(m);
 			}
 		} else {
 			pte = *pmap_pde_to_pte(pdep, va);
@@ -2317,10 +2318,10 @@ retry:
 				    &pa))
 					goto retry;
 				m = PHYS_TO_VM_PAGE(pa);
+				if (m != NULL)
+					vm_page_hold(m);
 			}
 		}
-		if (m != NULL)
-			vm_page_hold(m);
 	}
 	PA_UNLOCK_COND(pa);
 	PMAP_UNLOCK(pmap);

Modified: head/sys/i386/i386/pmap.c
==============================================================================
--- head/sys/i386/i386/pmap.c	Thu Jul  5 17:13:37 2018	(r336007)
+++ head/sys/i386/i386/pmap.c	Thu Jul  5 17:26:13 2018	(r336008)
@@ -1673,6 +1673,7 @@ retry:
 				    PG_PS_FRAME) | (va & PDRMASK), &pa))
 					goto retry;
 				m = PHYS_TO_VM_PAGE(pa);
+				vm_page_hold(m);
 			}
 		} else {
 			pte = pmap_pte_ufast(pmap, va, pde);
@@ -1682,10 +1683,10 @@ retry:
 				    &pa))
 					goto retry;
 				m = PHYS_TO_VM_PAGE(pa);
+				if (m != NULL)
+					vm_page_hold(m);
 			}
 		}
-		if (m != NULL)
-			vm_page_hold(m);
 	}
 	PA_UNLOCK_COND(pa);
 	PMAP_UNLOCK(pmap);