From nobody Sat Apr 09 00:27:53 2022 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 2F04D1AABB70; Sat, 9 Apr 2022 00:27:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KZwtx4sl2z3pG5; Sat, 9 Apr 2022 00:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649464073; 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=MQ1l/xE/7vn5eTdtxscK79ESWBMCtn9qZf+lneuAdZQ=; b=Kly1Nsn7qlrh/re1nV84P9DT4dBQJcRjMcnEm6n+LagPHWBUX4ko+QHsOgpq+7jdIGK1V5 f4qrTa+MN9YAG5JMuzRZpiAbTbH4cYF5JPPWZ+URdEMCG6ndYS41Gary0cfw5YfHzoZAJi +A1sBjg7rV4ka6OHzMmCx+6XCbR2hIC9yLHJGE4Y9WEfOuF6XOJgayeA4MAbXdCI1ECj1E EeuAgHRcmcNfEp8F1jg7fc+r9qPIMWeKBwCB+D2CXLGL4CY2eN4y9v4usWDwfhrUekWAQ9 qkkUDXLYFcDItQvh3ncCIR5baFCBsdiP71KaJvkmUQUNXgB0QUN0/HhtyvaoFg== 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 2E9C074DF; Sat, 9 Apr 2022 00:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2390RrkJ056579; Sat, 9 Apr 2022 00:27:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2390RrJW056578; Sat, 9 Apr 2022 00:27:53 GMT (envelope-from git) Date: Sat, 9 Apr 2022 00:27:53 GMT Message-Id: <202204090027.2390RrJW056578@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c1480b1702b4 - main - i386 pmap: Re-quiet set but unused warnings. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1480b1702b412e4448cd4ce0bade77d76e8fa26 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649464073; 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=MQ1l/xE/7vn5eTdtxscK79ESWBMCtn9qZf+lneuAdZQ=; b=StO0gUGQEwrnIyY4Cuj1x+m/K/9NFYHDd1PcR7j151n71kkA9E0z5FEqBQftT+TrbPLfJU RPE5FrZACzN3z+v98MMj7OxZJUJ+c8u+rkkCgHPu5hMaVerI1C7Ir0xwSdfP6GwkNf+lqP ndXF5gfgMarUOyQp0P1bvDL0hEen9ROycMcRyi3I7Bt3w9ApNUJGX/U/aQ8m7TjriaFBmU hos2Y+o2yqB5mMxNY7w+Oy94p4ZFtPYxBXGJ2YbJMRZ6+tRtLyHjmBmKT/UPIT8hH0TTQL MJvm7GJakrjKa+ufOOSAKOoxyzBxwYc/moYcsalfYtQAV3I5LjbqyEcAI69XdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649464073; a=rsa-sha256; cv=none; b=ZoBifMVtVF7Oh5wFM4U88S1MUidNmFO4PzrMX9KNKT6feAG8Uq8FMjrJ31890xZmOfV0mh Ru/wLuAV3KKay6VVys1z7xPKXGMYFIisMHyMDY9p6tm3ULPI4+0ovrH32SgQyzP10Ld7sx 1Rzw8iVyg6If/zJLJI9GAQP7QI4De2QOVYbaVzPGCkgQoKH2+ZY0q+J7K75oSucoRNAHfg s4SN0ELay0RQh0D0iSQ/axxT8vg08KWXOHLZvXkEGyt/vEbTS0mZpRUhqNT4SSUdgUL6+I w4avdAI0zimQhRNksNhxYZfnJzlngzWJlZnq7BoiqAK436nw6Qn/qgkvuIdasg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c1480b1702b412e4448cd4ce0bade77d76e8fa26 commit c1480b1702b412e4448cd4ce0bade77d76e8fa26 Author: John Baldwin AuthorDate: 2022-04-09 00:25:13 +0000 Commit: John Baldwin CommitDate: 2022-04-09 00:25:13 +0000 i386 pmap: Re-quiet set but unused warnings. __diagused no longer covers KTR, so use explicit #ifdef KTR instead. --- sys/i386/i386/pmap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 4644083b6408..2452445f7203 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -3493,7 +3493,9 @@ pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va) { pd_entry_t newpde; pt_entry_t *firstpte, oldpte, pa, *pte; - vm_offset_t oldpteva __diagused; +#ifdef KTR + vm_offset_t oldpteva; +#endif vm_page_t mpte; PMAP_LOCK_ASSERT(pmap, MA_OWNED); @@ -3553,8 +3555,10 @@ setpte: oldpte & ~PG_RW)) goto setpte; oldpte &= ~PG_RW; +#ifdef KTR oldpteva = (oldpte & PG_FRAME & PDRMASK) | (va & ~PDRMASK); +#endif CTR2(KTR_PMAP, "pmap_promote_pde: protect for va %#x" " in pmap %p", oldpteva, pmap); }