 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_map.c,v 1.379 2020/04/18 03:27:13 thorpej Exp $	*/
+/*	$NetBSD: uvm_map.c,v 1.380 2020/04/18 17:22:26 riastradh Exp $	*/
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * Copyright (c) 1991, 1993, The Regents of the University of California.
+ *
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * The Mach Operating System project at Carnegie-Mellon University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -56,27 +56,27 @@
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 /*
  * uvm_map.c: uvm map operations
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.379 2020/04/18 03:27:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.380 2020/04/18 17:22:26 riastradh Exp $");
 #include "opt_ddb.h"
 #include "opt_pax.h"
 #include "opt_uvmhist.h"
 #include "opt_uvm.h"
 #include "opt_sysv.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mman.h>
 #include <sys/proc.h>
 #include <sys/pool.h>
 #include <sys/kernel.h>
 @@ -2603,27 +2603,27 @@ uvm_map_extract(struct vm_map *srcmap, v
 	 * REMOVE.
 	 */
 	KASSERT((start & PAGE_MASK) == 0 && (len & PAGE_MASK) == 0);
 	KASSERT((flags & UVM_EXTRACT_REMOVE) == 0 ||
 		(flags & (UVM_EXTRACT_CONTIG|UVM_EXTRACT_QREF)) == 0);
 	/*
 	 * step 1: reserve space in the target map for the extracted area
 	 */
 	if ((flags & UVM_EXTRACT_RESERVED) == 0) {
 		dstaddr = vm_map_min(dstmap);
 		if (!uvm_map_reserve(dstmap, len, start,
 		    atop(start) & uvmexp.colormask, &dstaddr,
 		    UVM_FLAG_COLORMATCH))
 			return (ENOMEM);
 		KASSERT((atop(start ^ dstaddr) & uvmexp.colormask) == 0);
 		*dstaddrp = dstaddr;	/* pass address back to caller */
 		UVMHIST_LOG(maphist, "  dstaddr=%#jx", dstaddr,0,0,0);
 	} else {
 		dstaddr = *dstaddrp;
+	}
 	/*
 	 * step 2: setup for the extraction process loop by init'ing the
 	 * map entry chain, locking src map, and looking up the first useful
 @@ -4161,27 +4161,27 @@ uvmspace_exec(struct lwp *l, vaddr_t sta
 		 */
 		if (uvm_shmexit && ovm->vm_shm)
 			(*uvm_shmexit)(ovm);
 		/*
 		 * POSIX 1003.1b -- "lock future mappings" is revoked
 		 * when a process execs another program image.
 		 */
 		map->flags &= ~VM_MAP_WIREFUTURE;
 		/*
 		 * now unmap the old program.
+		 *
 		 * XXX set VM_MAP_DYING for the duration, so pmap_update()
 		 * is not called until the pmap has been totally cleared out
 		 * after pmap_remove_all(), or it can confuse some pmap
 		 * implementations.  it would be nice to handle this by
 		 * deferring the pmap_update() while it is known the address
 		 * space is not visible to any user LWP other than curlwp,
 		 * but there isn't an elegant way of inferring that right
 		 * now.
 		 */
 		flags = pmap_remove_all(map->pmap) ? UVM_FLAG_VAONLY : 0;
 		map->flags |= VM_MAP_DYING;
 		uvm_unmap1(map, vm_map_min(map), vm_map_max(map), flags);
 @@ -5010,48 +5010,48 @@ uvm_voaddr_release(struct uvm_voaddr * c
+ *
  * => memcmp() semantics
  */
 int
 uvm_voaddr_compare(const struct uvm_voaddr * const voaddr1,
     const struct uvm_voaddr * const voaddr2)
+{
 	KASSERT(voaddr1->type == UVM_VOADDR_TYPE_OBJECT ||
 		voaddr1->type == UVM_VOADDR_TYPE_ANON);
 	KASSERT(voaddr2->type == UVM_VOADDR_TYPE_OBJECT ||
 		voaddr2->type == UVM_VOADDR_TYPE_ANON);
 	if (voaddr1->type < voaddr2->type)
 		return -1;
 	if (voaddr1->type > voaddr2->type)
 		return 1;
 	/* These fields are unioned together. */
 	CTASSERT(offsetof(struct uvm_voaddr, uobj) ==
 		 offsetof(struct uvm_voaddr, anon));
 	const uintptr_t addr1 = (uintptr_t)voaddr1->uobj;
 	const uintptr_t addr2 = (uintptr_t)voaddr2->uobj;
 	if (addr1 < addr2)
 		return -1;
 	if (addr1 > addr2)
 		return 1;
 	if (voaddr1->offset < voaddr2->offset)
 		return -1;
 	if (voaddr1->offset > voaddr2->offset)
 		return 1;
 	return 0;
+}
 #if defined(DDB) || defined(DEBUGPRINT)
 /*
  * uvm_map_printit: actually prints the map
  */
 void
 uvm_map_printit(struct vm_map *map, bool full,
     void (*pr)(const char *, ...))
+{