From nobody Sat Aug 9 20:38:20 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bzt5S3X8zz64KwP; Sat, 09 Aug 2025 20:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bzt5S2Xjhz3KG6; Sat, 09 Aug 2025 20:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754771900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V7WpMDqzggYaU/1UQU1j5Wc70vc/W824Ezfi/BWyOzw=; b=AJ+Aq1UtdVjxEKz07M1uT+018adJZGNoRd46/o4npORl9YGqPkcir0iwTNV+cBg0i6dkn8 WglgB3S0tJD0iGvWqJjN6ufMXNm3Wcj7ew6nFGfmayFlJ1QV4exdGT+DAZaoy+p2Hygl9Y GCgjbTl7Cz+g9wtEeuP2em6Ue2bL+/uIm6Eybw87TVtwWfpBhhfVyRv8ivHwsGxnXzetpv gISfz9wZD9nnue7ZWqX54BrZ73KI0+egO8ikuzLD7Aj2xB4SRYJpVHf5RooBJXniuovH37 Ho//ijX6awAVxuSTPAAe76E1nIKiknwIy9Z5l3WsINpYOuF8TvXUiLEPQj80rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754771900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V7WpMDqzggYaU/1UQU1j5Wc70vc/W824Ezfi/BWyOzw=; b=UakrCGELvzLmPwK3xR+4Iy21e2jd6332e7fnd8rc7cXXLQTdoGJecD+ClVWFCNmq+zkl8o T6cQh537LOLHyfPuNmpHgXBES8Ws56nPMGz2JkbAxLTN+IoE7OOgdjPdMpaLjhTARnQF9N 4037EUUXPKIA1us3XMhsVuGAuZ7526gaJsDRfv2niP5qsTs2sudOG/D/S///JzaidYtYG5 XWd4+PhZs0v9NBdGU8IIJ4FUPrOfFigdV4ZlPhdy379IzWowuwcyOYb9fWDFi/ekGYmL8a U3wfP+5eZgoMoxiHfr9B5DkHdjXPvBt4KPZA0V0bxZoqe19FXe8oXR7iseVHxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754771900; a=rsa-sha256; cv=none; b=sDODqHzM8kkg/HFJFAX/ob+DavoM+8TOCTTW/9T2CuWDbls2Pj5o4VZk19KEANxMgY/gME zURPjhnkVLPUUYIBzxkVLZ64SDyVtSy9vLSXOWfXesDH7haxqWCIApgCD1mLr58aF+/o5F GSeSuuEPGmNxGkO05pylMNgtpucrcA1fbAZWZt2LuM8XB3jt+UgWwnGpkc2QzHzfxq/6zZ SmG7VMJWTKtiHd2vtNgp3USNR7K/LBdmuJ7naWorCcbSiJ2FZt5LpHkDcLxJRhnNX801qt E/GxDtJJ+IFUUKPesVvkgZAXgyGXzwX2BBso1pyrw0zv7WtEix9LPfMBfp7AFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bzt5S283wzcqn; Sat, 09 Aug 2025 20:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 579KcKHe025165; Sat, 9 Aug 2025 20:38:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 579KcKNW025162; Sat, 9 Aug 2025 20:38:20 GMT (envelope-from git) Date: Sat, 9 Aug 2025 20:38:20 GMT Message-Id: <202508092038.579KcKNW025162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Cox Subject: git: 84df9c02785b - stable/14 - amd64 pmap: fix mismerge List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alc X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 84df9c02785ba3ca6bbf9d83fa043a640d8d9b97 Auto-Submitted: auto-generated The branch stable/14 has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=84df9c02785ba3ca6bbf9d83fa043a640d8d9b97 commit 84df9c02785ba3ca6bbf9d83fa043a640d8d9b97 Author: Alan Cox AuthorDate: 2025-08-09 20:28:15 +0000 Commit: Alan Cox 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