 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_map.c,v 1.306 2011/11/23 01:00:52 matt Exp $	*/
+/*	$NetBSD: uvm_map.c,v 1.307 2011/12/20 13:47:38 yamt 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.306 2011/11/23 01:00:52 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.307 2011/12/20 13:47:38 yamt Exp $");
 #include "opt_ddb.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/malloc.h>
 #include <sys/pool.h>
 #include <sys/kernel.h>
 @@ -1226,26 +1226,33 @@ uvm_map(struct vm_map *map, vaddr_t *sta
 	} else if (new_entry) {
 		uvm_mapent_free(new_entry);
+	}
 #if defined(DEBUG)
 	if (!error && VM_MAP_IS_KERNEL(map)) {
 		uvm_km_check_empty(map, *startp, *startp + size);
+	}
 #endif /* defined(DEBUG) */
 	return error;
+}
 /*
  * uvm_map_prepare:
+ *
  * called with map unlocked.
  * on success, returns the map locked.
  */
 int
 uvm_map_prepare(struct vm_map *map, vaddr_t start, vsize_t size,
     struct uvm_object *uobj, voff_t uoffset, vsize_t align, uvm_flag_t flags,
     struct uvm_map_args *args)
+{
 	struct vm_map_entry *prev_entry;
 	vm_prot_t prot = UVM_PROTECTION(flags);
 	vm_prot_t maxprot = UVM_MAXPROTECTION(flags);
 	UVMHIST_FUNC("uvm_map_prepare");
 	UVMHIST_CALLED(maphist);
 	UVMHIST_LOG(maphist, "(map=0x%x, start=0x%x, size=%d, flags=0x%x)",
 @@ -1362,26 +1369,33 @@ retry:
+	}
 	args->uma_flags = flags;
 	args->uma_prev = prev_entry;
 	args->uma_start = start;
 	args->uma_size = size;
 	args->uma_uobj = uobj;
 	args->uma_uoffset = uoffset;
 	UVMHIST_LOG(maphist, "<- done!", 0,0,0,0);
 	return 0;
+}
 /*
  * uvm_map_enter:
+ *
  * called with map locked.
  * unlock the map before returning.
  */
 int
 uvm_map_enter(struct vm_map *map, const struct uvm_map_args *args,
     struct vm_map_entry *new_entry)
+{
 	struct vm_map_entry *prev_entry = args->uma_prev;
 	struct vm_map_entry *dead = NULL;
 	const uvm_flag_t flags = args->uma_flags;
 	const vm_prot_t prot = UVM_PROTECTION(flags);
 	const vm_prot_t maxprot = UVM_MAXPROTECTION(flags);
 	const vm_inherit_t inherit = UVM_INHERIT(flags);
 	const int amapwaitflag = (flags & UVM_FLAG_NOWAIT) ?
 	    AMAP_EXTEND_NOWAIT : 0;
 @@ -1397,26 +1411,27 @@ uvm_map_enter(struct vm_map *map, const
 	const int kmap = (vm_map_pmap(map) == pmap_kernel());
 	int merged = 0;
 	int error;
 	int newetype;
 	UVMHIST_FUNC("uvm_map_enter");
 	UVMHIST_CALLED(maphist);
 	UVMHIST_LOG(maphist, "(map=0x%x, start=0x%x, size=%d, flags=0x%x)",
 	    map, start, size, flags);
 	UVMHIST_LOG(maphist, "  uobj/offset 0x%x/%d", uobj, uoffset,0,0);
 	KASSERT(map->hint == prev_entry); /* bimerge case assumes this */
 	KASSERT(vm_map_locked_p(map));
 	if (flags & UVM_FLAG_QUANTUM) {
 		KASSERT(new_entry);
 		KASSERT(new_entry->flags & UVM_MAP_QUANTUM);
+	}
 	if (uobj)
 		newetype = UVM_ET_OBJ;
 	else
 		newetype = 0;
 	if (flags & UVM_FLAG_COPYONW) {
 		newetype |= UVM_ET_COPYONWRITE;
 @@ -4948,26 +4963,27 @@ uvm_mapent_unreserve(struct vm_map *map,
  */
 int
 uvm_mapent_trymerge(struct vm_map *map, struct vm_map_entry *entry, int flags)
+{
 	struct uvm_object *uobj;
 	struct vm_map_entry *next;
 	struct vm_map_entry *prev;
 	vsize_t size;
 	int merged = 0;
 	bool copying;
 	int newetype;
 	KASSERT(vm_map_locked_p(map));
 	if (VM_MAP_USE_KMAPENT(map)) {
 		return 0;
+	}
 	if (entry->aref.ar_amap != NULL) {
 		return 0;
+	}
 	if ((entry->flags & UVM_MAP_NOMERGE) != 0) {
 		return 0;
+	}
 	uobj = entry->object.uvm_obj;
 	size = entry->end - entry->start;
 	copying = (flags & UVM_MERGE_COPYING) != 0;