 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_malloc.c,v 1.152 2018/08/22 12:42:06 maxv Exp $	*/
+/*	$NetBSD: kern_malloc.c,v 1.153 2018/08/22 14:12:30 christos Exp $	*/
 /*
  * Copyright (c) 1987, 1991, 1993
  *	The Regents of the University of California.  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.
 @@ -60,31 +60,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kern_malloc.c	8.4 (Berkeley) 5/20/95
  */
 /*
  * Wrapper interface for obsolete malloc(9).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.152 2018/08/22 12:42:06 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.153 2018/08/22 14:12:30 christos Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_kasan.h"
 #endif
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/asan.h>
 /*
  * Built-in malloc types.  Note: ought to be removed.
  */
 MALLOC_DEFINE(M_DEVBUF, "devbuf", "device driver memory");
 MALLOC_DEFINE(M_DMAMAP, "DMA map", "bus_dma(9) structures");
 MALLOC_DEFINE(M_FREE, "free", "should be on free list");
 MALLOC_DEFINE(M_TEMP, "temp", "misc. temporary data buffers");
 @@ -105,73 +101,67 @@ struct malloc_header {
 } __aligned(ALIGNBYTES + 1);
 void *
 kern_malloc(unsigned long size, int flags)
+{
 	const int kmflags = (flags & M_NOWAIT) ? KM_NOSLEEP : KM_SLEEP;
 #ifdef KASAN
 	const size_t origsize = size;
 #endif
 	size_t allocsize, hdroffset;
 	struct malloc_header *mh;
 	void *p;
 #ifdef KASAN
 	kasan_add_redzone(&size);
 #endif
 	if (size >= PAGE_SIZE) {
 		if (size > (ULONG_MAX-PAGE_SIZE))
 			allocsize = ULONG_MAX;	/* this will fail later */
 		else
 			allocsize = PAGE_SIZE + size; /* for page alignment */
 		hdroffset = PAGE_SIZE - sizeof(struct malloc_header);
 	} else {
 		allocsize = sizeof(struct malloc_header) + size;
 		hdroffset = 0;
+	}
 	p = kmem_intr_alloc(allocsize, kmflags);
 	if (p == NULL)
 		return NULL;
 	if ((flags & M_ZERO) != 0) {
 		memset(p, 0, allocsize);
+	}
 	mh = (void *)((char *)p + hdroffset);
 	mh->mh_size = allocsize - hdroffset;
 #ifdef KASAN
 	mh->mh_rqsz = origsize;
 #endif
 	mh++;
 #ifdef KASAN
 	kasan_alloc(mh, origsize, size);
 #endif
 	return mh;
+}
 void
 kern_free(void *addr)
+{
 	struct malloc_header *mh;
 	mh = addr;
 	mh--;
 #ifdef KASAN
 	kasan_free(addr, mh->mh_size);
 #endif
 	if (mh->mh_size >= PAGE_SIZE + sizeof(struct malloc_header))
 		kmem_intr_free((char *)addr - PAGE_SIZE,
 		    mh->mh_size + PAGE_SIZE - sizeof(struct malloc_header));
 	else
 		kmem_intr_free(mh, mh->mh_size);
+}
 void *
 kern_realloc(void *curaddr, unsigned long newsize, int flags)
+{
 	struct malloc_header *mh;
 	unsigned long cursize;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_kmem.c,v 1.70 2018/08/22 09:38:21 maxv Exp $	*/
+/*	$NetBSD: subr_kmem.c,v 1.71 2018/08/22 14:12:30 christos Exp $	*/
 /*-
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran and Maxime Villard.
+ *
  * 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.
 @@ -82,31 +82,30 @@
  *	A kernel with "option DEBUG" has "kmem_guard" debugging feature compiled
  *	in. See the comment below for what kind of bugs it tries to detect. Even
  *	if compiled in, it's disabled by default because it's very expensive.
  *	You can enable it on boot by:
  *		boot -d
  *		db> w kmem_guard_depth 0t30000
  *		db> c
+ *
  *	The default value of kmem_guard_depth is 0, which means disabled.
  *	It can be changed by KMEM_GUARD_DEPTH kernel config option.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.70 2018/08/22 09:38:21 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.71 2018/08/22 14:12:30 christos Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_kmem.h"
 #include "opt_kasan.h"
 #endif
 #include <sys/param.h>
 #include <sys/callback.h>
 #include <sys/kmem.h>
 #include <sys/pool.h>
 #include <sys/debug.h>
 #include <sys/lockdebug.h>
 #include <sys/cpu.h>
 #include <sys/asan.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_map.h>
 @@ -214,27 +213,29 @@ static bool kmem_guard_enabled;
 static struct kmem_guard kmem_guard;
 #endif /* defined(KMEM_GUARD) */
 CTASSERT(KM_SLEEP == PR_WAITOK);
 CTASSERT(KM_NOSLEEP == PR_NOWAIT);
 /*
  * kmem_intr_alloc: allocate wired memory.
  */
 void *
 kmem_intr_alloc(size_t requested_size, km_flag_t kmflags)
+{
 #ifdef KASAN
 	const size_t origsize = requested_size;
 #endif
 	size_t allocsz, index;
 	size_t size;
 	pool_cache_t pc;
 	uint8_t *p;
 	KASSERT(requested_size > 0);
 	KASSERT((kmflags & KM_SLEEP) || (kmflags & KM_NOSLEEP));
 	KASSERT(!(kmflags & KM_SLEEP) || !(kmflags & KM_NOSLEEP));
 #ifdef KMEM_GUARD
 	if (kmem_guard_enabled) {
 		return kmem_guard_alloc(&kmem_guard, requested_size,