CVS commit: src/sys/arch/x86/x86

[Andrew Doran]

Module Name:    src
Committed By:   ad
Date:           Wed Mar  4 22:00:03 UTC 2020

Modified Files:
        src/sys/arch/x86/x86: pmap.c

Log Message:
pmap_enter(): ditch pv_entry if unmanaged.  Shouldn't happen I think, but
do for the sake of correctness.


To generate a diff of this commit:
cvs rdiff -u -r1.361 -r1.362 src/sys/arch/x86/x86/pmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.361 src/sys/arch/x86/x86/pmap.c:1.362
--- src/sys/arch/x86/x86/pmap.c:1.361	Sun Mar  1 21:42:58 2020
+++ src/sys/arch/x86/x86/pmap.c	Wed Mar  4 22:00:03 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.361 2020/03/01 21:42:58 ad Exp $	*/
+/*	$NetBSD: pmap.c,v 1.362 2020/03/04 22:00:03 ad Exp $	*/
 
 /*
  * Copyright (c) 2008, 2010, 2016, 2017, 2019, 2020 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.361 2020/03/01 21:42:58 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.362 2020/03/04 22:00:03 ad Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -4415,8 +4415,8 @@ pmap_enter_ma(struct pmap *pmap, vaddr_t
 		if ((opte & PTE_PVLIST) != 0 && pve != NULL) {
 			KASSERT(pve->pve_pte.pte_ptp == ptp);
 			KASSERT(pve->pve_pte.pte_va == va);
+			pve = NULL;
 		}
-		pve = NULL;
 		goto same_pa;
 	}
 
@@ -5293,8 +5293,8 @@ pmap_ept_enter(struct pmap *pmap, vaddr_
 		if ((opte & EPT_PVLIST) != 0 && pve != NULL) {
 			KASSERT(pve->pve_pte.pte_ptp == ptp);
 			KASSERT(pve->pve_pte.pte_va == va);
+			pve = NULL;
 		}
-		pve = NULL;
 		goto same_pa;
 	}