diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 61bde1a523e8..2c1ccb3b9739 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -482,10 +482,9 @@ vm_fault_populate(struct faultstate *fs, vm_prot_t prot, int fault_type, m_mtx = NULL; for (i = 0; i < npages; i++) { vm_page_change_lock(&m[i], &m_mtx); - if ((fault_flags & VM_FAULT_WIRE) != 0) { - KASSERT(wired, ("VM_FAULT_WIRE && !wired")); + if ((fault_flags & VM_FAULT_WIRE) != 0) vm_page_wire(&m[i]); - } else + else vm_page_activate(&m[i]); if (m_hold != NULL && m[i].pindex == fs->first_pindex) { *m_hold = &m[i]; @@ -1247,6 +1246,10 @@ readrest: unlock_and_deallocate(&fs); goto RetryFault; } + + /* Reassert because wired may have changed. */ + KASSERT(wired || (fault_flags & VM_FAULT_WIRE) == 0, + ("!wired && VM_FAULT_WIRE")); } } @@ -1290,10 +1293,9 @@ readrest: * If the page is not wired down, then put it where the pageout daemon * can find it. */ - if ((fault_flags & VM_FAULT_WIRE) != 0) { - KASSERT(wired, ("VM_FAULT_WIRE && !wired")); + if ((fault_flags & VM_FAULT_WIRE) != 0) vm_page_wire(fs.m); - } else + else vm_page_activate(fs.m); if (m_hold != NULL) { *m_hold = fs.m;