From nobody Tue Apr 12 21:59:16 2022 X-Original-To: dev-commits-src-main@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 003591AFB51B; Tue, 12 Apr 2022 21:59:17 +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 4KdKPc3P9Bz4hhm; Tue, 12 Apr 2022 21:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649800756; 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=GxHnEa2utyxqCSzTST5TBkK7pH7vO7rZX4ZS9zr0GNU=; b=oXs5bg8jouypOET1eF7wpj9bASDSOfabtog71QvWTKZPyItpmaJdNOu9NlTiAwH5PMprAi w0g3eauj0MllQK0lyp2YDw7++THvrNsIQAhS0TIaODr9IpaGiN0ns2gaQjfU54gGQTI2SQ Awu9sHf+udD1LYk7yYMmspmZ49cbrF/4hdupii9GmfJP3l4tgV36LW902BFhzvKV5RietR vRxnzO4os8n0ylMDSfmizps8XSoCRBmHzCYB3Ctw8KJ4fi8NMbnIkrifNDRSRSx/yzBHgv 3ntXoPpPTME8pSdLXHra4R2eBa5THL7i68eWtM5nL7y6DE8nf3PeV4oreAJk5w== 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 3D6DB1F80C; Tue, 12 Apr 2022 21:59:16 +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 23CLxGx1035301; Tue, 12 Apr 2022 21:59:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23CLxGRm035300; Tue, 12 Apr 2022 21:59:16 GMT (envelope-from git) Date: Tue, 12 Apr 2022 21:59:16 GMT Message-Id: <202204122159.23CLxGRm035300@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: c9d26ca24c8b - main - ppc mmoea64: Workaround set but unused warnings for RB_NEXT. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: c9d26ca24c8b962f9c1e3a2044c8d98c328d8c42 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649800756; 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=GxHnEa2utyxqCSzTST5TBkK7pH7vO7rZX4ZS9zr0GNU=; b=RfafMsNiyrCOi9R2oooiq+yiLGZMLxL7hkh1RhNSZcTMfe3uxabXZ5AQHRi+ngP058viYW osFHLxa8aH/c7Kr9U+KcXIBCaWJ7BnHQvdRCXUDGH21NW7CRxGim6i7K8GogMQ1L7Q+6C4 zcqb7j1HFQH9D+BRwuhCw0+qIQpE9W8BY67eHEkiLFDxtZJzLUoyN5j2xRl9Jxuxud3o5P 0YQL3Ch7EMAg4L7Jv+z9OA5ShBL+jJts7zCQQm0CG4tblyBUsz6/Gvrr2JAHL8lzM1JOBc s7HHl9fcbrcA1lb3lymO8t4f4qWPCoPxbuMiSr/vGW66AKT4HVQpZlzBcbXHpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649800756; a=rsa-sha256; cv=none; b=LmoQLKe1P7Ue6/UO0betxhtZZsOfZZtNbxvn6+h8lR9gkLXjSBbn1p/VDr0Jd4y2L543pb O5D5357SZXCWzXpyOywIDU+iM+cSsqo8k253puY3NEnIa+pyBAhNPI2C/jkgNWFuV9llIs q3d36psCvy6qMhZlOK0I9mEc8j8ohD0lKPcPJykuYN/XXmI6zHlYpMxa3owe8V1VRKW17H OJFjqHUQ0TF6Artn189C4/VyoBUixUb6mS9Lzp+m9L5cbO50MZDbZUOzST0bBK31kpeVn0 Kw+jHzBObHcaXddLya/4MUi71WQMoqnKP3tO2hZrBqEvBS6uPzGYje1NAA5IHw== 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=c9d26ca24c8b962f9c1e3a2044c8d98c328d8c42 commit c9d26ca24c8b962f9c1e3a2044c8d98c328d8c42 Author: John Baldwin AuthorDate: 2022-04-12 21:58:58 +0000 Commit: John Baldwin CommitDate: 2022-04-12 21:58:58 +0000 ppc mmoea64: Workaround set but unused warnings for RB_NEXT. Inline the unused expression passed as the second argument to RB_NEXT. --- sys/powerpc/aim/moea64_native.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/powerpc/aim/moea64_native.c b/sys/powerpc/aim/moea64_native.c index 367b99856502..167c4ea064b1 100644 --- a/sys/powerpc/aim/moea64_native.c +++ b/sys/powerpc/aim/moea64_native.c @@ -925,14 +925,12 @@ moea64_pte_unset_sp_locked(struct pvo_entry *pvo) volatile struct lpte *pt; uint64_t ptehi, refchg, vpn; vm_offset_t eva; - pmap_t pm; - pm = pvo->pvo_pmap; refchg = 0; eva = PVO_VADDR(pvo) + HPT_SP_SIZE; for (; pvo != NULL && PVO_VADDR(pvo) < eva; - pvo = RB_NEXT(pvo_tree, &pm->pmap_pvo, pvo)) { + pvo = RB_NEXT(pvo_tree, &pvo->pvo_pmap->pmap_pvo, pvo)) { pt = moea64_pteg_table + pvo->pvo_pte.slot; ptehi = be64toh(pt->pte_hi); if ((ptehi & LPTE_AVPN_MASK) != @@ -975,13 +973,11 @@ moea64_pte_insert_sp_locked(struct pvo_entry *pvo) struct lpte insertpt; int64_t ret; vm_offset_t eva; - pmap_t pm; - pm = pvo->pvo_pmap; eva = PVO_VADDR(pvo) + HPT_SP_SIZE; for (; pvo != NULL && PVO_VADDR(pvo) < eva; - pvo = RB_NEXT(pvo_tree, &pm->pmap_pvo, pvo)) { + pvo = RB_NEXT(pvo_tree, &pvo->pvo_pmap->pmap_pvo, pvo)) { moea64_pte_from_pvo(pvo, &insertpt); pvo->pvo_pte.slot &= ~7ULL; /* Base slot address */