Index: sys/amd64/amd64/pmap.c
===================================================================
--- sys/amd64/amd64/pmap.c	(revision 271922)
+++ sys/amd64/amd64/pmap.c	(working copy)
@@ -146,7 +146,7 @@
 #endif
 
 static __inline boolean_t
-pmap_type_guest(pmap_t pmap)
+pmap_type_nested(pmap_t pmap)
 {
 
 	return ((pmap->pm_type == PT_EPT) || (pmap->pm_type == PT_RVI));
@@ -1249,7 +1249,7 @@
 {
 	pt_entry_t PG_G;
 
-	if (pmap_type_guest(pmap))
+	if (pmap_type_nested(pmap))
 		return;
 
 	KASSERT(pmap->pm_type == PT_X86,
@@ -1363,7 +1363,7 @@
 	cpuset_t other_cpus;
 	u_int cpuid;
 
-	if (pmap_type_guest(pmap)) {
+	if (pmap_type_nested(pmap)) {
 		pmap_invalidate_ept(pmap);
 		return;
 	}
@@ -1441,7 +1441,7 @@
 	vm_offset_t addr;
 	u_int cpuid;
 
-	if (pmap_type_guest(pmap)) {
+	if (pmap_type_nested(pmap)) {
 		pmap_invalidate_ept(pmap);
 		return;
 	}
@@ -1500,7 +1500,7 @@
 	uint64_t cr3;
 	u_int cpuid;
 
-	if (pmap_type_guest(pmap)) {
+	if (pmap_type_nested(pmap)) {
 		pmap_invalidate_ept(pmap);
 		return;
 	}
@@ -1622,7 +1622,7 @@
 	cpuid = PCPU_GET(cpuid);
 	other_cpus = all_cpus;
 	CPU_CLR(cpuid, &other_cpus);
-	if (pmap == kernel_pmap || pmap_type_guest(pmap)) 
+	if (pmap == kernel_pmap || pmap_type_nested(pmap)) 
 		active = all_cpus;
 	else {
 		active = pmap->pm_active;