From nobody Sat Dec 02 21:56:01 2023 X-Original-To: dev-commits-src-branches@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 4SjNzP5XVdz52nrF; Sat, 2 Dec 2023 21:56:01 +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 4SjNzP55VJz4q5S; Sat, 2 Dec 2023 21:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701554161; 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=x+43g+Thu0qVkkpgUj/IdRgo7OBJSLTaTBk1ZrJRPi0=; b=N2zl8Pk11ryjQA4uKvtRZnCGcKNjmHzvPqM2FJblpNPjxf2IOVF2jyzlnSKQ1JzsNGeh8j uEv3ffoDOdCDSCnx7oxY3SsxC/CXGPqc70DaC0ncTQdbeP8jw9KPTUzsbCNbVPOKfs9bQF zSlaPYCLhxB1JSa5IsSuKvGIx3u+U5INKYijaQriYLIjOSb3Xd7ffzXAncqZgZCnhsAd33 Mgt76WuGcgYYwAOpxDc70pbG7QEqQQKU/WkC518HVYQBvklELGyyc4JDZVknS/csjyEfi1 +BqBP8b+lr/gomIpmfH+sW8SSPOgdnRV+EmKXte2hF54mP8PRrLyon4avGLaTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701554161; 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=x+43g+Thu0qVkkpgUj/IdRgo7OBJSLTaTBk1ZrJRPi0=; b=mnLToSrlK4EPx//rK9SUdj1/WrRwD6DVl0B1dusTp9UUG5TSLDFA6QIJ70VBGJpfPmHs5B Ab1Zwb/bBVT9SjDKcG6B/+tvOlTCcz14oQkVACGmWG+ADBgbBYhgkj65cuFjhXoHSTV+MI cgM0PBDFotc852BVhNjYCEcjcuzQP+/3jZ9e7u6jEywSGID6B2hQOn60lzlGBU5OeCnpHp BkIEFSuR4jGPlYCzP5GAX59tGy75gY2bdIUf0AfQXKnf6BVv+dz+a8AZCnoKA1TAXnCdpJ 2z/gNM9OzEFcANoNmxR4cFkRMfWynIsNt6fSf4vZl/9oZuE5B/4SNq2xPbXkRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701554161; a=rsa-sha256; cv=none; b=GZHJsIipY3YP7wcwuumOu68/+ub+2Eq3ulBm6+JSowZy787zi0ko93EzmyA9FH7cZofs9l rtIkJeB+CfOxtpuGG/FXmi5TqHt+bNs7musXihgsFUDcbL9GSs86feOKiymkII9jC+muhv CxnsS3LbHyuTZkTQEr+3ScAM9nCEsjTyrI5dRvf0V+WP6IAjWTL+LNch963Br1tp6LINfP TdaPeqqh2LeeJou/da8aO3U9lBw9GuMw+0hEvOy2oQNBTxDsoaeyG5pyzo0S+fdkOlmjCg NC8H4I5o/Uh56bPlVAt87kHf4dsucSoQPQ7TQVgQ8kwyNqlfBb4/XU1CrNBNEg== 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 4SjNzP3hCtzYVr; Sat, 2 Dec 2023 21:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B2Lu13X034888; Sat, 2 Dec 2023 21:56:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B2Lu1T1034885; Sat, 2 Dec 2023 21:56:01 GMT (envelope-from git) Date: Sat, 2 Dec 2023 21:56:01 GMT Message-Id: <202312022156.3B2Lu1T1034885@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 04e48937f1bf - stable/14 - riscv: Update a variable name to match a comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 04e48937f1bfff2f2a984e719556527c8b44dd45 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=04e48937f1bfff2f2a984e719556527c8b44dd45 commit 04e48937f1bfff2f2a984e719556527c8b44dd45 Author: Mark Johnston AuthorDate: 2023-11-03 13:34:11 +0000 Commit: Mark Johnston CommitDate: 2023-12-02 21:54:36 +0000 riscv: Update a variable name to match a comment This makes pmap_insert_pt_page() consistent with arm64 and amd64. No functional change intended. Reported by: alc Fixes: 7703ac2e983b ("riscv: Port improvements from arm64/amd64 pmaps, part 1") (cherry picked from commit 368b97361a0379acaec4a385c5c9d83ba6edc5a2) --- sys/riscv/riscv/pmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 7dce0cd9f5be..8bd5b5e9374d 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -1200,15 +1200,15 @@ pmap_add_delayed_free_list(vm_page_t m, struct spglist *free, * field will be set to VM_PAGE_BITS_ALL. */ static __inline int -pmap_insert_pt_page(pmap_t pmap, vm_page_t ml3, bool promoted, +pmap_insert_pt_page(pmap_t pmap, vm_page_t mpte, bool promoted, bool all_l3e_PTE_A_set) { PMAP_LOCK_ASSERT(pmap, MA_OWNED); KASSERT(promoted || !all_l3e_PTE_A_set, ("a zero-filled PTP can't have PTE_A set in every PTE")); - ml3->valid = promoted ? (all_l3e_PTE_A_set ? VM_PAGE_BITS_ALL : 1) : 0; - return (vm_radix_insert(&pmap->pm_root, ml3)); + mpte->valid = promoted ? (all_l3e_PTE_A_set ? VM_PAGE_BITS_ALL : 1) : 0; + return (vm_radix_insert(&pmap->pm_root, mpte)); } /*