diff --git a/sys/dev/xen/blkfront/blkfront.c b/sys/dev/xen/blkfront/blkfront.c
index 8487e8e35f4..bd82eed9dd2 100644
--- a/sys/dev/xen/blkfront/blkfront.c
+++ b/sys/dev/xen/blkfront/blkfront.c
@@ -325,7 +325,7 @@ xb_quiesce(struct blkfront_info *info)
 		}
 		if (blkif_queued_requests) {
 			// Still pending requests, wait for the disk i/o to complete
-			HYPERVISOR_block();
+			HYPERVISOR_yield();
 		}
 	}
 }
diff --git a/sys/i386/xen/pmap.c b/sys/i386/xen/pmap.c
index b25d0ba32ca..1b4345f07e9 100644
--- a/sys/i386/xen/pmap.c
+++ b/sys/i386/xen/pmap.c
@@ -3103,7 +3103,7 @@ pmap_kenter_temporary(vm_paddr_t pa, int i)
 	vm_offset_t va;
 
 	va = (vm_offset_t)crashdumpmap + (i * PAGE_SIZE);
-	pmap_kenter(va, pa);
+	PT_SET_MA(va, (pa & ~PAGE_MASK) | PG_V | pgeflag);
 	invlpg(va);
 	return ((void *)crashdumpmap);
 }