Index: sys/amd64/amd64/pmap.c
===================================================================
--- sys/amd64/amd64/pmap.c
+++ sys/amd64/amd64/pmap.c
@@ -7536,7 +7536,8 @@
 			PCPU_SET(kcr3, pmap->pm_cr3);
 			PCPU_SET(ucr3, pmap->pm_ucr3);
 		}
-	}
+	} else
+		PCPU_SET(curpmap, pmap);
 	if (pmap->pm_ucr3 != PMAP_NO_CR3) {
 		rsp0 = ((vm_offset_t)PCPU_PTR(pti_stack) +
 		    PC_PTI_STACK_SZ * sizeof(uint64_t)) & ~0xful;