Module Name: src
Committed By: ad
Date: Tue Jan 7 21:18:24 UTC 2020
Modified Files:
src/sys/arch/x86/x86: pmap.c
Log Message:
pmap_ept_enter(): PTE -> EPT in two places.
To generate a diff of this commit:
cvs rdiff -u -r1.353 -r1.354 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.353 src/sys/arch/x86/x86/pmap.c:1.354
--- src/sys/arch/x86/x86/pmap.c:1.353 Sat Jan 4 22:49:20 2020
+++ src/sys/arch/x86/x86/pmap.c Tue Jan 7 21:18:24 2020
@@ -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 @@ pmap_ept_enter(struct pmap *pmap, vaddr_
*/
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 @@ pmap_ept_enter(struct pmap *pmap, vaddr_
}
(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);
}
/*
