[src/trunk]: src/sys/arch/x86/x86 pmap_enter(): ditch pv_entry if unmanaged. ...

[ad <ad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/16bf189423b3
branches:  trunk
changeset: 969888:16bf189423b3
user:      ad <ad%NetBSD.org@localhost>
date:      Wed Mar 04 22:00:03 2020 +0000

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

diffstat:

 sys/arch/x86/x86/pmap.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 109de6fb7bdd -r 16bf189423b3 sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Wed Mar 04 19:28:04 2020 +0000
+++ b/sys/arch/x86/x86/pmap.c   Wed Mar 04 22:00:03 2020 +0000
@@ -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 @@
                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 @@
                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;
        }