git: e4078494f344 - main - vm_fault: Revert commit 64087fd7f372

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=e4078494f344bcba8709216bd601efa3dd05f6b3

commit e4078494f344bcba8709216bd601efa3dd05f6b3
Author:     Bojan Novković <bojan.novkovic@fer.hr>
AuthorDate: 2023-11-09 15:04:48 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-11-09 15:14:05 +0000

    vm_fault: Revert commit 64087fd7f372
    
    The underlying issue that originally triggered a kernel panic was
    addressed and the fix was ported to all relevant pmaps, so the
    safeguards placed in vm_fault.c can be removed now.
    
    Reviewed by:    alc, kib, markj
    MFC after:      1 month
    Differential Revision:  https://reviews.freebsd.org/D42517
---
 sys/vm/vm_fault.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index dd044d27f00f..58761e97f5f8 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -386,7 +386,7 @@ vm_fault_soft_fast(struct faultstate *fs)
 	    rounddown2(vaddr, pagesizes[m_super->psind]) >= fs->entry->start &&
 	    roundup2(vaddr + 1, pagesizes[m_super->psind]) <= fs->entry->end &&
 	    (vaddr & (pagesizes[m_super->psind] - 1)) == (VM_PAGE_TO_PHYS(m) &
-	    (pagesizes[m_super->psind] - 1)) && !fs->wired &&
+	    (pagesizes[m_super->psind] - 1)) &&
 	    pmap_ps_enabled(fs->map->pmap)) {
 		flags = PS_ALL_VALID;
 		if ((fs->prot & VM_PROT_WRITE) != 0) {
@@ -619,7 +619,7 @@ vm_fault_populate(struct faultstate *fs)
 		psind = m->psind;
 		if (psind > 0 && ((vaddr & (pagesizes[psind] - 1)) != 0 ||
 		    pidx + OFF_TO_IDX(pagesizes[psind]) - 1 > pager_last ||
-		    !pmap_ps_enabled(fs->map->pmap) || fs->wired))
+		    !pmap_ps_enabled(fs->map->pmap)))
 			psind = 0;
 
 		npages = atop(pagesizes[psind]);