[src/trunk]: src/sys/arch/x86/x86 pmap_ept_enter(): PTE -> EPT in two places.

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

details:   https://anonhg.NetBSD.org/src/rev/99026d4bf9cc
branches:  trunk
changeset: 968230:99026d4bf9cc
user:      ad <ad%NetBSD.org@localhost>
date:      Tue Jan 07 21:18:24 2020 +0000

description:
pmap_ept_enter(): PTE -> EPT in two places.

diffstat:

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

diffs (36 lines):

diff -r 9044b63e388a -r 99026d4bf9cc sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Tue Jan 07 20:50:12 2020 +0000
+++ b/sys/arch/x86/x86/pmap.c   Tue Jan 07 21:18:24 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.353 2020/01/04 22:49:20 ad Exp $    */
+/*     $NetBSD: pmap.c,v 1.354 2020/01/07 21:18:24 ad Exp $    */
 
 /*
  * Copyright (c) 2008, 2010, 2016, 2017, 2019 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.353 2020/01/04 22:49:20 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.354 2020/01/07 21:18:24 ad Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -5281,7 +5281,7 @@
         */
        if (((opte ^ npte) & (PTE_FRAME | EPT_R)) == 0) {
                KASSERT(((opte ^ npte) & EPT_PVLIST) == 0);
-               if ((opte & PTE_PVLIST) != 0 && pve != NULL) {
+               if ((opte & EPT_PVLIST) != 0 && pve != NULL) {
                        KASSERT(pve->pve_pte.pte_ptp == ptp);
                        KASSERT(pve->pve_pte.pte_va == va);
                }
@@ -5304,7 +5304,7 @@
                }
 
                (void)pmap_remove_pv(pmap, old_pp, ptp, va, pve);
-               old_pp->pp_attrs |= pmap_pte_to_pp_attrs(opte);
+               old_pp->pp_attrs |= pmap_ept_to_pp_attrs(opte);
        }
 
        /*