From nobody Wed Apr 13 23:10:13 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 174231B424B7; Wed, 13 Apr 2022 23:10:14 +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 4Kdyx12w9mz4m76; Wed, 13 Apr 2022 23:10:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891413; 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=Yh9G+NfVtitZCFWZJEJtfbfv54lNNvTu6FI6jKrYHf0=; b=JMf2MYZGn7DljECli1YjMjR7V4HcYK/WBQMfyi3DxT6+DES+6wIXNIh4UIuO7TPXBfipRp xkShcEx1PhFAvfNLy2N/nnv8GXVuKXPhuYmKELa59DM8nBv77kI2ZwJa4mL5YVWFWbBEaa iRCYvCis/JEF7WMRrloiytcVRNQ9WFEUWRXWhID856Hfb2oYqfYJBJycY2nM0JNfjHbUEs gL3qKLNJuPz3uKOOU/iB3fMWCGSqfNEmPAx6JGw9yOkEIaEjLfK5qzNQuN32MGy7T2NioB ciFtMhDpNpLEsiY3OmurD4446dr+FQA/zYiaqtVL2lcpGm3ccf+F11lNosC9ow== 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 2D6201540B; Wed, 13 Apr 2022 23:10:13 +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 23DNADb1079621; Wed, 13 Apr 2022 23:10:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DNADvk079618; Wed, 13 Apr 2022 23:10:13 GMT (envelope-from git) Date: Wed, 13 Apr 2022 23:10:13 GMT Message-Id: <202204132310.23DNADvk079618@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: 1c311640c0a6 - main - powerpc: Use __diagused for variables only used in KASSERT(). 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: 1c311640c0a65cd5a0105481b69554b52c6017ae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891413; 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=Yh9G+NfVtitZCFWZJEJtfbfv54lNNvTu6FI6jKrYHf0=; b=omazCsJwaOQ8XTh/fmd+o5C0CMYqhOnyMAs/s+NM8AhEi7rjC6+iNksuifTkhgsbW10SeZ NFoeJ5QEKX15u7KZsVMDe+P/+J45zV0rmIFeZceRsaBpiNUI9ZV+wIHp9YsQWF6lM38l+l XsZXTyTn7aNBc2xBBCpTQEP/W2xltg+3F/0yJCADiqI5tVK0+0HM6RdWSKTbJlmxOYzuYT tTFBJNcBkeLiLr0vPXNTAqRtK7eYjB6Mg+A2wECaQF98fV+gPM61RJ0UiRqb4nGC18Ljnq sJBMedSCQoAJ2Z2KB90zMzSfHVosLuGU40/H3IzsqFON77/Sjygnib1tZBhlmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649891413; a=rsa-sha256; cv=none; b=touMvmLLFWPYnaySKvUNLA7nTpZ0/SPc7rDzUNZrL/S+MzmO7QCfOCNbr2HBRQeHorGjh8 aJZo1nMc9+TOK7pCNGpbQ1z5PYrwJFmwbo4doY1NKQJK1O4+B5fi032h4/4byWGYIcNZDx cll+1yuZyRQUcxwf2xljLXDYei65cqUKAhOn1ychqUslmsSZjfFegh41ECYZp1a5KfePmA Gk9QDDC46mKzcjbMZgHrO6RFtOLRL37zUmpexWNROXdT6qOEjLvtqzCWPjLs/upxHXSkVo wBRagopuV6qbi3DKGl3GGq1vifr8lQy6oijZf/qrViU7kqwVBJWyB+CkyPyjZQ== 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=1c311640c0a65cd5a0105481b69554b52c6017ae commit 1c311640c0a65cd5a0105481b69554b52c6017ae Author: John Baldwin AuthorDate: 2022-04-13 23:08:23 +0000 Commit: John Baldwin CommitDate: 2022-04-13 23:08:23 +0000 powerpc: Use __diagused for variables only used in KASSERT(). --- sys/powerpc/aim/mmu_oea64.c | 6 +++--- sys/powerpc/pseries/mmu_phyp.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c index a066511a863e..ba8e8bf23fb4 100644 --- a/sys/powerpc/aim/mmu_oea64.c +++ b/sys/powerpc/aim/mmu_oea64.c @@ -3683,7 +3683,7 @@ moea64_sp_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_paddr_t pa, spa; bool sync; struct pvo_dlist tofree; - int error, i; + int error __diagused, i; uint16_t aflags; KASSERT((va & HPT_SP_MASK) == 0, ("%s: va %#jx unaligned", @@ -3924,7 +3924,7 @@ moea64_sp_demote_aligned(struct pvo_entry *sp) vm_offset_t va, va_end; vm_paddr_t pa; vm_page_t m; - pmap_t pmap; + pmap_t pmap __diagused; int64_t refchg; CTR2(KTR_PMAP, "%s: va=%#jx", __func__, (uintmax_t)PVO_VADDR(sp)); @@ -4084,7 +4084,7 @@ moea64_sp_remove(struct pvo_entry *sp, struct pvo_dlist *tofree) { struct pvo_entry *pvo, *tpvo; vm_offset_t eva; - pmap_t pm; + pmap_t pm __diagused; CTR2(KTR_PMAP, "%s: va=%#jx", __func__, (uintmax_t)PVO_VADDR(sp)); diff --git a/sys/powerpc/pseries/mmu_phyp.c b/sys/powerpc/pseries/mmu_phyp.c index 5769f0db5572..67d0b5821f4f 100644 --- a/sys/powerpc/pseries/mmu_phyp.c +++ b/sys/powerpc/pseries/mmu_phyp.c @@ -320,7 +320,7 @@ mphyp_pte_clear(struct pvo_entry *pvo, uint64_t ptebit) struct rm_priotracker track; int64_t refchg; uint64_t ptelo, junk; - int err; + int err __diagused; /* * This involves two steps (synch and clear) so we need the entry @@ -589,7 +589,7 @@ mphyp_pte_unset_sp(struct pvo_entry *pvo) uint64_t junk, refchg; int err; vm_offset_t eva; - pmap_t pm; + pmap_t pm __diagused; pm = pvo->pvo_pmap; PMAP_LOCK_ASSERT(pm, MA_OWNED); @@ -624,7 +624,7 @@ mphyp_pte_insert_sp(struct pvo_entry *pvo) int64_t ret; struct lpte pte; vm_offset_t eva; - pmap_t pm; + pmap_t pm __diagused; pm = pvo->pvo_pmap; PMAP_LOCK_ASSERT(pm, MA_OWNED);