From nobody Wed Apr 13 23:09:15 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 E65841B4013F; Wed, 13 Apr 2022 23:09:16 +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 4Kdyvv414vz4lqL; Wed, 13 Apr 2022 23:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891355; 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=MP3hagbjecbelcIueXwbZwuNV8A/d1WyBsXbesWDMIA=; b=Smt+uVWuJJrat0JigdLLgrw097mZu0mLELJXAG/1KgUM9105PKdQd07h+5xjpP4Ljzajv2 RBsOZW6pGaML3Rx/9UM9SlbWwzKpHFuLQe4it6HIjLeTmlmEIt2AZ9Xry6p2+jruw8RnCQ x1O6cg4nR8HiOz8Ng2uuJjqvnIHIMYIRHzrj0MRcNxE3nfSnSkvq23QHnJJIewGdjjm/0c /pjGxRCb+SW6KhT1AdjI0iMkuL+V2MMEDAOeNz0bPBvNrWm3OI8iHZdHzW0y4si68l/2RD UI/uWpOQKQz4dsAJAtmkjL9ELd8CSdNpalJfP9xKaBlMhqD1yXQvMg0xRLxjHA== 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 3A83314F7B; Wed, 13 Apr 2022 23:09:15 +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 23DN9FmS074133; Wed, 13 Apr 2022 23:09:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DN9FPT074132; Wed, 13 Apr 2022 23:09:15 GMT (envelope-from git) Date: Wed, 13 Apr 2022 23:09:15 GMT Message-Id: <202204132309.23DN9FPT074132@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: b8ebd99aa5fe - main - vm: Use __diagused for variables only used in KASSERT(). 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: b8ebd99aa5fedbfc8060ec080e1395ba25aeab63 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891355; 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=MP3hagbjecbelcIueXwbZwuNV8A/d1WyBsXbesWDMIA=; b=sdOKD/OdGde+GPBAACk+D5p4xNwRgpvojdqOtfKuRc0dMleVeEapp7evKBatqwyIeTBAPb +NSXcoo18VXcor6bzb1tMfpk/2Zijw7G1ZDQfqHR5Au5NDAdp/8qUFDeaOKw2YysGCvxvo 38rO109HkNcNoNIb5d5a/tIfeJbTHcpXZdAYYzXj7iyGyTCj16zW2KRI/yb+TslHe6xAKe 01RigdDJVCFyEuTIFLGYYjd4JiuyCCcT+yRHz+J7L8j4/JHgGdd6osxvv8FpusLAWQuHFD Ao7jc0R2BJxyZAwWx+CmoVzlyvW2Vp6UHCbzd1wDURpOmibHZECzV+jPKWSy8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649891355; a=rsa-sha256; cv=none; b=TcUAa6HTPeW/RM/2WPBBsZi5gNFc7AypYy4dweTV2ioLiUxpDOS0B3fUzimlMldO6MeZbY 1Xu+UHuukFBzI7fsDPebPMoglQoXsWeB4WCRMjXcn1R1a3TXX3SSKwa4e19rYnAgoNuacF v1chYcwzG4MRtkOjKtwC0IoI6J4tg0SfsRtyn1sGZs8DOmr7WWRETeUoMeAh2BZ9nvdlrt zoNZu0QzWKM/EfLLM9isfrRPakeMvH9LOQcWTJhhO7p69vwe/5T3PLI5HKhKzeD83+h4iB Hv919ZUklM1Cpx67NRRhNT3XsxPG2ycH+ZjYOYSFawXQ9ACK1m5TjbiCaTNvRQ== 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=b8ebd99aa5fedbfc8060ec080e1395ba25aeab63 commit b8ebd99aa5fedbfc8060ec080e1395ba25aeab63 Author: John Baldwin AuthorDate: 2022-04-13 23:08:20 +0000 Commit: John Baldwin CommitDate: 2022-04-13 23:08:20 +0000 vm: Use __diagused for variables only used in KASSERT(). --- sys/vm/swap_pager.c | 2 +- sys/vm/vm_map.c | 8 ++++---- sys/vm/vm_page.c | 4 ++-- sys/vm/vm_swapout.c | 2 +- sys/vm/vnode_pager.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index ef126ee5fdf3..b1acaeb04bd8 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -1015,7 +1015,7 @@ static bool swp_pager_xfer_source(vm_object_t srcobject, vm_object_t dstobject, vm_pindex_t pindex, daddr_t addr) { - daddr_t dstaddr; + daddr_t dstaddr __diagused; KASSERT((srcobject->flags & OBJ_SWAP) != 0, ("%s: Srcobject not swappable", __func__)); diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 2efefd16defb..1842b6e1a314 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -223,7 +223,7 @@ static void kmapent_free(void *item, vm_size_t size, uint8_t pflag) { vm_offset_t addr; - int error; + int error __diagused; if ((pflag & UMA_SLAB_PRIV) == 0) /* XXX leaked */ @@ -4250,7 +4250,7 @@ vmspace_fork(struct vmspace *vm1, vm_ooffset_t *fork_charge) vm_map_t new_map, old_map; vm_map_entry_t new_entry, old_entry; vm_object_t object; - int error, locked; + int error, locked __diagused; vm_inherit_t inh; old_map = &vm1->vm_map; @@ -4600,13 +4600,13 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) vm_offset_t gap_end, gap_start, grow_start; vm_size_t grow_amount, guard, max_grow; rlim_t lmemlim, stacklim, vmemlim; - int rv, rv1; + int rv, rv1 __diagused; bool gap_deleted, grow_down, is_procstack; #ifdef notyet uint64_t limit; #endif #ifdef RACCT - int error; + int error __diagused; #endif p = curproc; diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 3a0d70a47423..50fe50ddb46c 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -1545,7 +1545,7 @@ static void vm_page_object_remove(vm_page_t m) { vm_object_t object; - vm_page_t mrem; + vm_page_t mrem __diagused; vm_page_assert_xbusied(m); object = m->object; @@ -1770,7 +1770,7 @@ static bool vm_page_replace_hold(vm_page_t mnew, vm_object_t object, vm_pindex_t pindex, vm_page_t mold) { - vm_page_t mret; + vm_page_t mret __diagused; bool dropped; VM_OBJECT_ASSERT_WLOCKED(object); diff --git a/sys/vm/vm_swapout.c b/sys/vm/vm_swapout.c index 008dd6f00cbc..fc9686d58a4f 100644 --- a/sys/vm/vm_swapout.c +++ b/sys/vm/vm_swapout.c @@ -560,7 +560,7 @@ vm_thread_swapin(struct thread *td, int oom_alloc) { vm_page_t ma[KSTACK_MAX_PAGES]; vm_offset_t kaddr; - int a, count, i, j, pages, rv; + int a, count, i, j, pages, rv __diagused; kaddr = td->td_kstack; pages = td->td_kstack_pages; diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 4330c17c2033..c9917ecc2589 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -1290,7 +1290,7 @@ static void vnode_pager_putpages(vm_object_t object, vm_page_t *m, int count, int flags, int *rtvals) { - int rtval; + int rtval __diagused; struct vnode *vp; int bytes = count * PAGE_SIZE;