The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b8ebd99aa5fedbfc8060ec080e1395ba25aeab63
commit b8ebd99aa5fedbfc8060ec080e1395ba25aeab63 Author: John Baldwin <[email protected]> AuthorDate: 2022-04-13 23:08:20 +0000 Commit: John Baldwin <[email protected]> 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;
