Date: Sat, 9 Aug 2025 20:38:20 GMT From: Alan Cox <alc@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 84df9c02785b - stable/14 - amd64 pmap: fix mismerge Message-ID: <202508092038.579KcKNW025162@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=84df9c02785ba3ca6bbf9d83fa043a640d8d9b97 commit 84df9c02785ba3ca6bbf9d83fa043a640d8d9b97 Author: Alan Cox <alc@FreeBSD.org> AuthorDate: 2025-08-09 20:28:15 +0000 Commit: Alan Cox <alc@FreeBSD.org> CommitDate: 2025-08-09 20:35:18 +0000 amd64 pmap: fix mismerge Fixes: 702224d7e082 ("preallocate another page table page in pmap_demote_DMAP()") --- sys/amd64/amd64/pmap.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 69d4008dda91..7fc17a55d2a1 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -6036,25 +6036,9 @@ pmap_demote_pde_mpte(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, oldpde = *pde; KASSERT((oldpde & (PG_PS | PG_V)) == (PG_PS | PG_V), ("pmap_demote_pde: oldpde is missing PG_PS and/or PG_V")); -<<<<<<< HEAD - - /* - * Invalidate the 2MB page mapping and return "failure" if the - * mapping was never accessed. - */ - if ((oldpde & PG_A) == 0) { - KASSERT((oldpde & PG_W) == 0, - ("pmap_demote_pde: a wired mapping is missing PG_A")); - pmap_demote_pde_abort(pmap, va, pde, oldpde, lockp); - return (FALSE); - } - - mpte = pmap_remove_pt_page(pmap, va); -======= KASSERT((oldpde & PG_MANAGED) == 0 || lockp != NULL, ("pmap_demote_pde: lockp for a managed mapping is NULL")); in_kernel = va >= VM_MAXUSER_ADDRESS; ->>>>>>> 88c8cba04395 (amd64 pmap: preallocate another page table page in pmap_demote_DMAP()) if (mpte == NULL) { /* * Invalidate the 2MB page mapping and return "failure" if the
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202508092038.579KcKNW025162>