 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_extern.h,v 1.197 2016/05/25 17:43:58 christos Exp $	*/
+/*	$NetBSD: uvm_extern.h,v 1.198 2016/07/20 12:38:43 maxv Exp $	*/
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -617,26 +617,28 @@ int			uvm_vslock(struct vmspace *, void
 void			uvm_vsunlock(struct vmspace *, void *, size_t);
 void			uvm_cpu_attach(struct cpu_info *);
 /* uvm_init.c */
 void			uvm_init(void);
 /* uvm_io.c */
 int			uvm_io(struct vm_map *, struct uio *, int);
 /* uvm_km.c */
 vaddr_t			uvm_km_alloc(struct vm_map *, vsize_t, vsize_t,
 			    uvm_flag_t);
 int			uvm_km_protect(struct vm_map *, vaddr_t, vsize_t,
 			    vm_prot_t);
 void			uvm_km_free(struct vm_map *, vaddr_t, vsize_t,
 			    uvm_flag_t);
 struct vm_map		*uvm_km_suballoc(struct vm_map *, vaddr_t *,
 			    vaddr_t *, vsize_t, int, bool,
 			    struct vm_map *);
 #ifdef _KERNEL
 int			uvm_km_kmem_alloc(vmem_t *, vmem_size_t, vm_flag_t,
 			    vmem_addr_t *);
 void			uvm_km_kmem_free(vmem_t *, vmem_addr_t, vmem_size_t);
 bool			uvm_km_va_starved_p(void);
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_km.c,v 1.139 2015/02/06 18:19:22 maxv Exp $	*/
+/*	$NetBSD: uvm_km.c,v 1.140 2016/07/20 12:38:43 maxv 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:
 @@ -142,27 +142,27 @@
  * kmem_meta_arena:
  *	Imports from kmem_va_meta_arena.  Allocations from this arena are
  *	backed with the pages.
+ *
  * Arena stacking:
+ *
  *	kmem_arena
  *		kmem_va_arena
  *		kmem_va_meta_arena
  *			kmem_meta_arena
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.139 2015/02/06 18:19:22 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.140 2016/07/20 12:38:43 maxv Exp $");
 #include "opt_uvmhist.h"
 #include "opt_kmempages.h"
 #ifndef NKMEMPAGES
 #define NKMEMPAGES 0
 #endif
 /*
  * Defaults for lower and upper-bounds for the kmem_arena page count.
  * Can be overridden by kernel config options.
  */
 @@ -698,26 +698,36 @@ uvm_km_alloc(struct vm_map *map, vsize_t
 		    prot, PMAP_KMPAGE);
 		loopva += PAGE_SIZE;
 		offset += PAGE_SIZE;
 		loopsize -= PAGE_SIZE;
+	}
 	pmap_update(pmap_kernel());
 	UVMHIST_LOG(maphist,"<- done (kva=0x%x)", kva,0,0,0);
 	return(kva);
+}
 /*
  * uvm_km_protect: change the protection of an allocated area
  */
 int
 uvm_km_protect(struct vm_map *map, vaddr_t addr, vsize_t size, vm_prot_t prot)
+{
 	return uvm_map_protect(map, addr, addr + round_page(size), prot, false);
+}
 /*
  * uvm_km_free: free an area of kernel memory
  */
 void
 uvm_km_free(struct vm_map *map, vaddr_t addr, vsize_t size, uvm_flag_t flags)
+{
 	UVMHIST_FUNC(__func__); UVMHIST_CALLED(maphist);
 	KASSERT((flags & UVM_KMF_TYPEMASK) == UVM_KMF_WIRED ||
 		(flags & UVM_KMF_TYPEMASK) == UVM_KMF_PAGEABLE ||
 		(flags & UVM_KMF_TYPEMASK) == UVM_KMF_VAONLY);
 	KASSERT((addr & PAGE_MASK) == 0);
 	KASSERT(vm_map_pmap(map) == pmap_kernel());