Index: sys/x86/iommu/intel_utils.c
===================================================================
--- sys/x86/iommu/intel_utils.c
+++ sys/x86/iommu/intel_utils.c
@@ -260,12 +260,16 @@
 dmar_pgalloc(vm_object_t obj, vm_pindex_t idx, int flags)
 {
 	vm_page_t m;
-	int zeroed, aflags;
+	int aflags;
 
-	zeroed = (flags & IOMMU_PGF_ZERO) != 0 ? VM_ALLOC_ZERO : 0;
-	aflags = zeroed | VM_ALLOC_NOBUSY | VM_ALLOC_SYSTEM | VM_ALLOC_NODUMP |
-	    ((flags & IOMMU_PGF_WAITOK) != 0 ? VM_ALLOC_WAITFAIL :
-	    VM_ALLOC_NOWAIT);
+	KASSERT((flags & (IOMMU_PGF_ZERO | IOMMU_PGF_NOALLOC)) !=
+	    (IOMMU_PGF_ZERO | IOMMU_PGF_NOALLOC),
+	    ("%s: invalid flags %#x", __func__, flags));
+
+	aflags = (flags & IOMMU_PGF_ZERO) != 0 ? VM_ALLOC_ZERO : 0;
+	aflags |= VM_ALLOC_NOBUSY | VM_ALLOC_SYSTEM | VM_ALLOC_NODUMP;
+	aflags |= (flags & IOMMU_PGF_WAITOK) != 0 ? VM_ALLOC_WAITFAIL :
+	    VM_ALLOC_NOWAIT;
 	for (;;) {
 		if ((flags & IOMMU_PGF_OBJL) == 0)
 			VM_OBJECT_WLOCK(obj);
@@ -280,8 +284,6 @@
 		if ((flags & IOMMU_PGF_OBJL) == 0)
 			VM_OBJECT_WUNLOCK(obj);
 		if (m != NULL) {
-			if (zeroed && (m->flags & PG_ZERO) == 0)
-				pmap_zero_page(m);
 			atomic_add_int(&dmar_tbl_pagecnt, 1);
 			break;
 		}