From nobody Wed Apr 13 23:10:06 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 2673A1B42139; Wed, 13 Apr 2022 23:10:08 +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 4Kdywv1Yvpz4mQc; Wed, 13 Apr 2022 23:10:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891407; 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=Vfr/iYpK7vWWvlo99a5lLz/JRRJhVanQUy76hdc5zwk=; b=qg59u9rluidzO2lurHRrVVE69Zf4Eqi+msd1Nw873fwL3ZbA2MW2TQKjtXg8wHB6DNGcpI xrfPb2HNp1iZt0R8tmKkVkDlXpaXrNO6lD1jgSy1Z3r0xMaVDrR+7wUH1FeSXmJM81Uhwi jJIqKxT/k5xBU/buic5M+yorasvlsuQdQPn/JMUc4tO+Jfamk6wRide/mWFhrIgmCncbm2 QIIE4P7RD+e99ud5Dtm7TRVFQrpkSjKH4rOWT5Ild0GBEbQ34hJlyY+7W2yHABR0EX/9J4 1FjClq6mptQLB1RMwJKcB4XyLviLTV1/vZbsuDOXdbEE+CmY8xT+mqGQXbd/sA== 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 9F31315409; Wed, 13 Apr 2022 23:10:06 +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 23DNA6H7077825; Wed, 13 Apr 2022 23:10:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DNA6fC077823; Wed, 13 Apr 2022 23:10:06 GMT (envelope-from git) Date: Wed, 13 Apr 2022 23:10:06 GMT Message-Id: <202204132310.23DNA6fC077823@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: a56881d3e942 - main - riscv: 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: a56881d3e942b46e3bfb01199000c3cac25ccff2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891407; 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=Vfr/iYpK7vWWvlo99a5lLz/JRRJhVanQUy76hdc5zwk=; b=YK57rm2bxW5WmM7t712vG/nr7msSSweRyfttkiNQKcz5i74jsIIK7aunlP8diFvzQ/cz/N GUU/eSNUhrOCN7WjPBgbVfp10Q9trpBymHmLGV3JVxawvgXlIB5HQRstc7eTYliP9+i4+Y 9V7JON01e3tSrl8yLE1rwfxEo746CApAm+sLP1IoZtm+PVgqOXfE0QolbVbYFxqIC9/8ng WljorjyeAqhNf3ySUgsMipje0ojYEMbagS5XrsA746oB8aJBs7rY7UuIE2PI5dxNnmaxJ7 pm7gcGN/TJ8tsLs2RtBTSuduUUc96WUgyA/1tgKZ+ViwKDAF1FrXpwHz291G5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649891407; a=rsa-sha256; cv=none; b=ix18JHKZmNsZC6/aaK3I3UWmFIJuPtzt71qrgZxzNffJSA3IYF9zY4NfAdu8DDCBjBjRhz rj4LvUgqzO/VKs/fldp2puYDbRSK1TcnuhW9mIOTIH86s7VIefOeR+SVmwPwL/Qo7Vf6/W QDzChb4SqocWJ5ZxBW3ogHt8Q4RsytusGq3wfKpV2BuDu2qRhLjMWdAYsFgidEeb4/+Sdz KmwdGEBRNK2hHCYAQnjnokfqPjLSAupbwJOcQuFEq3v5srtXku/srLav7JxBrNRdQ4MGHD sj9GSJ9LXZFAw6G08QMumiDtj8KzJaFt9Sdj8Czz2jFkF4QdZ5LOwI56MDXDNw== 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=a56881d3e942b46e3bfb01199000c3cac25ccff2 commit a56881d3e942b46e3bfb01199000c3cac25ccff2 Author: John Baldwin AuthorDate: 2022-04-13 23:08:23 +0000 Commit: John Baldwin CommitDate: 2022-04-13 23:08:23 +0000 riscv: Use __diagused for variables only used in KASSERT(). --- sys/riscv/riscv/pmap.c | 8 ++++---- sys/riscv/riscv/sbi.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 287fab9720dd..076e26230eb9 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -511,7 +511,7 @@ pmap_early_page_idx(vm_offset_t l1pt, vm_offset_t va, u_int *l1_slot, u_int *l2_slot) { pt_entry_t *l2; - pd_entry_t *l1; + pd_entry_t *l1 __diagused; l1 = (pd_entry_t *)l1pt; *l1_slot = (va >> L1_SHIFT) & Ln_ADDR_MASK; @@ -2158,7 +2158,7 @@ pmap_pv_insert_l2(pmap_t pmap, vm_offset_t va, pd_entry_t l2e, u_int flags, static void pmap_remove_kernel_l2(pmap_t pmap, pt_entry_t *l2, vm_offset_t va) { - pt_entry_t newl2, oldl2; + pt_entry_t newl2, oldl2 __diagused; vm_page_t ml3; vm_paddr_t ml3pa; @@ -2422,7 +2422,7 @@ pmap_remove_all(vm_page_t m) struct md_page *pvh; pmap_t pmap; pt_entry_t *l3, l3e; - pd_entry_t *l2, l2e; + pd_entry_t *l2, l2e __diagused; pv_entry_t pv; vm_offset_t va; @@ -4730,7 +4730,7 @@ pmap_map_io_transient(vm_page_t page[], vm_offset_t vaddr[], int count, { vm_paddr_t paddr; boolean_t needs_mapping; - int error, i; + int error __diagused, i; /* * Allocate any KVA space that we need, this is done in a separate diff --git a/sys/riscv/riscv/sbi.c b/sys/riscv/riscv/sbi.c index 6897fce9cad3..c4b6da5887f7 100644 --- a/sys/riscv/riscv/sbi.c +++ b/sys/riscv/riscv/sbi.c @@ -155,7 +155,7 @@ sbi_print_version(void) void sbi_set_timer(uint64_t val) { - struct sbi_ret ret; + struct sbi_ret ret __diagused; /* Use the TIME legacy replacement extension, if available. */ if (has_time_extension) { @@ -169,7 +169,7 @@ sbi_set_timer(uint64_t val) void sbi_send_ipi(const u_long *hart_mask) { - struct sbi_ret ret; + struct sbi_ret ret __diagused; /* Use the IPI legacy replacement extension, if available. */ if (has_ipi_extension) { @@ -184,7 +184,7 @@ sbi_send_ipi(const u_long *hart_mask) void sbi_remote_fence_i(const u_long *hart_mask) { - struct sbi_ret ret; + struct sbi_ret ret __diagused; /* Use the RFENCE legacy replacement extension, if available. */ if (has_rfnc_extension) { @@ -199,7 +199,7 @@ sbi_remote_fence_i(const u_long *hart_mask) void sbi_remote_sfence_vma(const u_long *hart_mask, u_long start, u_long size) { - struct sbi_ret ret; + struct sbi_ret ret __diagused; /* Use the RFENCE legacy replacement extension, if available. */ if (has_rfnc_extension) { @@ -216,7 +216,7 @@ void sbi_remote_sfence_vma_asid(const u_long *hart_mask, u_long start, u_long size, u_long asid) { - struct sbi_ret ret; + struct sbi_ret ret __diagused; /* Use the RFENCE legacy replacement extension, if available. */ if (has_rfnc_extension) {