 @@ -1,14 +1,14 @@
-/*	$NetBSD: autoconf.c,v 1.67 2019/06/29 16:41:18 tsutsui Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.68 2021/01/03 17:42:10 thorpej Exp $	*/
 /*
  * Copyright (c) 1995 Leo Weppelman
  * Copyright (c) 1994 Christian E. Hopps
+ *
  * 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.
 @@ -21,39 +21,39 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.67 2019/06/29 16:41:18 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.68 2021/01/03 17:42:10 thorpej Exp $");
 #include "opt_md.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/buf.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <machine/disklabel.h>
 #include <machine/cpu.h>
 #include <atari/atari/device.h>
 #if defined(MEMORY_DISK_HOOKS)
 #include <dev/md.h>
 #endif
 #include "ioconf.h"
 static void findroot(void);
 static int mbmatch(device_t, cfdata_t, void *);
 static void mbattach(device_t, device_t, void *);
 @@ -95,28 +95,27 @@ cpu_rootconf(void)
 	 * installation md(4) ramdisk.
 	 * See sys/arch/atari/dev/md_root.c for details.
 	 */
 #define RAMD_NDEV	3	/* XXX */
 	if ((boothowto & RB_ASKNAME) != 0) {
 		int md_major, i;
 		cfdata_t cf;
 		struct md_softc *sc;
 		md_major = devsw_name2blk("md", NULL, 0);
 		if (md_major >= 0) {
 			for (i = 0; i < RAMD_NDEV; i++) {
-				cf = malloc(sizeof(*cf), M_DEVBUF,
+				cf = kmem_zalloc(sizeof(*cf), KM_SLEEP);
 				    M_ZERO|M_WAITOK);
 				if (cf == NULL)
 					break;	/* XXX */
 				cf->cf_name = md_cd.cd_name;
 				cf->cf_atname = md_cd.cd_name;
 				cf->cf_unit = i;
 				cf->cf_fstate = FSTATE_STAR;
 				/* XXX mutex */
 				sc = device_private(config_attach_pseudo(cf));
 				if (sc == NULL)
 					break;	/* XXX */
+			}
+		}
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: be_bus.c,v 1.16 2019/11/10 21:16:25 chs Exp $	*/
+/*	$NetBSD: be_bus.c,v 1.17 2021/01/03 17:42:10 thorpej Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Leo Weppelman.
+ *
  * 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.
 @@ -20,32 +20,32 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: be_bus.c,v 1.16 2019/11/10 21:16:25 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be_bus.c,v 1.17 2021/01/03 17:42:10 thorpej Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <machine/cpu.h>
 #include <sys/bus.h>
 /*
  * This file contains the common functions for using a big endian (linear)
  * bus on a big endian atari.
  */
 	/* Autoconf detection stuff */
 static int		beb_bus_space_peek_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t);
 static int		beb_bus_space_peek_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t);
 @@ -168,32 +168,32 @@ static void		beb_bus_space_set_region_8(
 #define __write_1(h, o, v)	*((volatile uint8_t  *)((h) + (o))) = (v)
 #define __write_2(h, o, v)	*((volatile uint16_t *)((h) + (o))) = (v)
 #define __write_4(h, o, v)	*((volatile uint32_t *)((h) + (o))) = (v)
 #define __write_8(h, o, v)	*((volatile uint64_t *)((h) + (o))) = (v)
 bus_space_tag_t
 beb_alloc_bus_space_tag(bus_space_tag_t storage)
+{
 	bus_space_tag_t	beb_t;
 	/*
 	 * Allow the caller to specify storage space for the tag. This
-	 * is used during console config (when malloc() can't be used).
+	 * is used during console config (when kmem_alloc() can't be used).
 	 */
 	if (storage != NULL)
 		beb_t = storage;
 	else {
-		beb_t = malloc(sizeof(*beb_t), M_TEMP, M_WAITOK);
+		beb_t = kmem_alloc(sizeof(*beb_t), KM_SLEEP);
+	}
 	memset(beb_t, 0, sizeof(*beb_t));
 	beb_t->abs_p_1   = beb_bus_space_peek_1;
 	beb_t->abs_p_2   = beb_bus_space_peek_2;
 	beb_t->abs_p_4   = beb_bus_space_peek_4;
 	beb_t->abs_p_8   = beb_bus_space_peek_8;
 	beb_t->abs_r_1   = beb_bus_space_read_1;
 	beb_t->abs_r_2   = beb_bus_space_read_2;
 	beb_t->abs_r_4   = beb_bus_space_read_4;
 	beb_t->abs_r_8   = beb_bus_space_read_8;
 	beb_t->abs_rs_1  = beb_bus_space_read_1;
 	beb_t->abs_rs_2  = beb_bus_space_read_2;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus.c,v 1.60 2018/03/10 03:44:43 tsutsui Exp $	*/
+/*	$NetBSD: bus.c,v 1.61 2021/01/03 17:42:10 thorpej Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center and by Chris G. Demetriou.
+ *
  * 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
 @@ -23,32 +23,32 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) 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.
  */
 #include "opt_m68k_arch.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.60 2018/03/10 03:44:43 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.61 2021/01/03 17:42:10 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/extent.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <uvm/uvm.h>
 #include <machine/cpu.h>
 #include <m68k/cacheops.h>
 #define	_ATARI_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 int  bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
 		bus_size_t alignment, bus_size_t boundary,
 		bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
 @@ -320,80 +320,84 @@ bus_space_mmap(bus_space_tag_t t, bus_ad
     int flags)
+{
 	/*
 	 * "addr" is the base address of the device we're mapping.
 	 * "off" is the offset into that device.
+	 *
 	 * Note we are called for each "page" in the device that
 	 * the upper layers want to map.
 	 */
 	return m68k_btop(addr + off);
+}
 static size_t
 _bus_dmamap_mapsize(int const nsegments)
+{
 	KASSERT(nsegments > 0);
 	return sizeof(struct atari_bus_dmamap) +
 	    (sizeof(bus_dma_segment_t) * (nsegments - 1));
+}
 /*
  * Common function for DMA map creation.  May be called by bus-specific
  * DMA map creation functions.
  */
 int
 _bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
     bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp)
+{
 	struct atari_bus_dmamap *map;
 	void *mapstore;
 	size_t mapsize;
 	/*
 	 * Allocate and initialize the DMA map.  The end of the map
 	 * is a variable-sized array of segments, so we allocate enough
 	 * room for them in one shot.
+	 *
 	 * Note we don't preserve the WAITOK or NOWAIT flags.  Preservation
 	 * of ALLOCNOW notifies others that we've reserved these resources,
 	 * and they are not to be freed.
+	 *
 	 * The bus_dmamap_t includes one bus_dma_segment_t, hence
 	 * the (nsegments - 1).
 	 */
-	mapsize = sizeof(struct atari_bus_dmamap) +
+	if ((mapstore = kmem_zalloc(_bus_dmamap_mapsize(nsegments),
-	    (sizeof(bus_dma_segment_t) * (nsegments - 1));
+	    (flags & BUS_DMA_NOWAIT) ? KM_NOSLEEP : KM_SLEEP)) == NULL)
 	if ((mapstore = malloc(mapsize, M_DMAMAP,
 	    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL)
 		return ENOMEM;
 	memset(mapstore, 0, mapsize);
 	map = (struct atari_bus_dmamap *)mapstore;
 	map->_dm_size = size;
 	map->_dm_segcnt = nsegments;
 	map->_dm_maxmaxsegsz = maxsegsz;
 	map->_dm_boundary = boundary;
 	map->_dm_flags = flags & ~(BUS_DMA_WAITOK|BUS_DMA_NOWAIT);
 	map->dm_maxsegsz = maxsegsz;
 	map->dm_mapsize = 0;		/* no valid mappings */
 	map->dm_nsegs = 0;
 	*dmamp = map;
 	return 0;
+}
 /*
  * Common function for DMA map destruction.  May be called by bus-specific
  * DMA map destruction functions.
  */
 void
 _bus_dmamap_destroy(bus_dma_tag_t t, bus_dmamap_t map)
+{
-	free(map, M_DMAMAP);
+	kmem_free(map, _bus_dmamap_mapsize(map->_dm_segcnt));
+}
 /*
  * Common function for loading a DMA map with a linear buffer.  May
  * be called by bus-specific DMA map load functions.
  */
 int
 _bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
     bus_size_t buflen, struct proc *p, int flags)
+{
 	paddr_t lastaddr;
 	int seg, error;
 	struct vmspace *vm;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intr.c,v 1.27 2019/11/10 21:16:25 chs Exp $	*/
+/*	$NetBSD: intr.c,v 1.28 2021/01/03 17:42:10 thorpej Exp $	*/
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Adam Glass, Gordon W. Ross, Jason R. Thorpe, and Leo Weppelman.
+ *
  * 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.
 @@ -20,32 +20,32 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.27 2019/11/10 21:16:25 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.28 2021/01/03 17:42:10 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/vmmeter.h>
 #include <sys/queue.h>
 #include <sys/device.h>
 #include <sys/cpu.h>
 #include <machine/intr.h>
 #define	AVEC_MIN	1
 #define	AVEC_MAX	7
 #define	AVEC_LOC	25
 #define	UVEC_MIN	0
 #define	UVEC_MAX	191
 #define	UVEC_LOC	64
 @@ -102,60 +102,59 @@ intr_init(void)
  *   - ih_arg
  *	The argument given to 'ih_fun' when ARG_CLOCKFRAME is not
  *	specified.
  */
 struct intrhand *
 intr_establish(int vector, int type, int pri, hw_ifun_t ih_fun, void *ih_arg)
+{
 	struct intrhand	*ih, *cur_vec;
 	ih_list_t	*vec_list;
 	u_long		*hard_vec;
 	int		s;
-	/* no point in sleeping unless someone can free memory. */
+	ih = kmem_alloc(sizeof *ih, KM_SLEEP);
 	ih = malloc(sizeof *ih, M_DEVBUF, M_WAITOK);
 	ih->ih_fun    = ih_fun;
 	ih->ih_arg    = ih_arg;
 	ih->ih_type   = type;
 	ih->ih_pri    = pri;
 	ih->ih_vector = vector;
 	/*
 	 * Do some validity checking on the 'vector' argument and determine
 	 * vector list this interrupt should be on.
 	 */
 	switch (type & (AUTO_VEC|USER_VEC)) {
 	case AUTO_VEC:
 		if (vector < AVEC_MIN || vector > AVEC_MAX) {
-			free(ih, M_DEVBUF);
+			kmem_free(ih, sizeof(*ih));
 			return NULL;
+		}
 		vec_list = &autovec_list[vector-1];
 		hard_vec = &autovects[vector-1];
 		ih->ih_intrcnt = &intrcnt_auto[vector-1];
 		break;
 	case USER_VEC:
 		if (vector < UVEC_MIN || vector > UVEC_MAX) {
-			free(ih, M_DEVBUF);
+			kmem_free(ih, sizeof(*ih));
 			return NULL;
+		}
 		vec_list = &uservec_list[vector];
 		hard_vec = &uservects[vector];
 		ih->ih_intrcnt = &intrcnt_user[vector];
 		break;
 	default:
 		printf("%s: bogus vector type\n", __func__);
-		free(ih, M_DEVBUF);
+		kmem_free(ih, sizeof(*ih));
 		return NULL;
+	}
 	/*
 	 * If the vec_list is empty, we insert ourselves at the head of the
 	 * list and we re-route the 'hard-vector' to the appropriate handler.
 	 */
 	if (vec_list->lh_first == NULL) {
 		s = splhigh();
 		LIST_INSERT_HEAD(vec_list, ih, ih_link);
 		if (type & FAST_VEC)
 			*hard_vec = (u_long)ih->ih_fun;
 @@ -171,27 +170,27 @@ intr_establish(int vector, int type, int
 			*hard_vec = (u_long)intr_glue;
+		}
 		splx(s);
 		return ih;
+	}
 	/*
 	 * Check for FAST_VEC botches
 	 */
 	cur_vec = vec_list->lh_first;
 	if (cur_vec->ih_type & FAST_VEC) {
-		free(ih, M_DEVBUF);
+		kmem_free(ih, sizeof(*ih));
 		printf("intr_establish: vector cannot be shared\n");
 		return NULL;
+	}
 	/*
 	 * We traverse the list and place ourselves after any handlers with
 	 * our current (or higher) priority level.
 	 */
 	for (cur_vec = vec_list->lh_first; cur_vec->ih_link.le_next != NULL;
 	    cur_vec = cur_vec->ih_link.le_next) {
 		if (ih->ih_pri > cur_vec->ih_pri) {
 			s = splhigh();
 @@ -249,27 +248,27 @@ intr_disestablish(struct intrhand *ih)
 			break;
+	}
 	if (ih != cur_vec) {
 		printf("intr_disestablish: 'ih' has inconsistent data\n");
 		return 0;
+	}
 	s = splhigh();
 	LIST_REMOVE(ih, ih_link);
 	if ((vec_list->lh_first == NULL) && (ih->ih_type & FAST_VEC))
 		*hard_vec = (u_long)intr_glue;
 	splx(s);
-	free(ih, M_DEVBUF);
+	kmem_free(ih, sizeof(*ih));
 	return 1;
+}
 /*
  * This is the dispatcher called by the low-level
  * assembly language interrupt-glue routine.
  */
 void
 intr_dispatch(struct clockframe frame)
+{
 	static int	unexpected, straycount;
 	int		vector;
 	int		handled = 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: le_bus.c,v 1.20 2019/11/10 21:16:25 chs Exp $	*/
+/*	$NetBSD: le_bus.c,v 1.21 2021/01/03 17:42:10 thorpej Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Leo Weppelman.
+ *
  * 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.
 @@ -20,32 +20,32 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: le_bus.c,v 1.20 2019/11/10 21:16:25 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: le_bus.c,v 1.21 2021/01/03 17:42:10 thorpej Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/bswap.h>
 #include <machine/cpu.h>
 #include <sys/bus.h>
 /*
  * This file contains the common functions for using a litte endian (linear)
  * bus on a big endian atari.
  */
 	/* Autoconf detection stuff */
 static int		leb_bus_space_peek_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t);
 static int		leb_bus_space_peek_2(bus_space_tag_t,
 @@ -252,32 +252,32 @@ static inline uint32_t swap32(uint32_t v
 #define __write_1(h, o, v)	*((volatile uint8_t *)((h) + (o))) = (v)
 #define __write_2(h, o, v)	*((volatile uint16_t *)((h) + (o))) = swap16(v)
 #define __write_4(h, o, v)	*((volatile uint32_t *)((h) + (o))) = swap32(v)
 #define __write_8(h, o, v)	*((volatile uint64_t *)((h) + (o))) = bswap64(v)
 bus_space_tag_t
 leb_alloc_bus_space_tag(bus_space_tag_t storage)
+{
 	bus_space_tag_t			leb_t;
 	/*
 	 * Allow the caller to specify storage space for the tag. This
-	 * is used during console config (when malloc() can't be used).
+	 * is used during console config (when kmem_alloc() can't be used).
 	 */
 	if (storage != NULL)
 		leb_t = storage;
 	else {
-		leb_t = malloc(sizeof(*leb_t), M_TEMP, M_WAITOK);
+		leb_t = kmem_alloc(sizeof(*leb_t), KM_SLEEP);
+	}
 	memset(leb_t, 0, sizeof(*leb_t));
 	leb_t->abs_p_1   = leb_bus_space_peek_1;
 	leb_t->abs_p_2   = leb_bus_space_peek_2;
 	leb_t->abs_p_4   = leb_bus_space_peek_4;
 	leb_t->abs_p_8   = leb_bus_space_peek_8;
 	leb_t->abs_r_1   = leb_bus_space_read_1;
 	leb_t->abs_r_2   = leb_bus_space_read_2;
 	leb_t->abs_r_4   = leb_bus_space_read_4;
 	leb_t->abs_r_8   = leb_bus_space_read_8;
 	leb_t->abs_rs_1  = leb_bus_space_read_1;
 	leb_t->abs_rs_2  = leb_bus_space_read_stream_2;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.183 2020/06/11 19:20:43 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.184 2021/01/03 17:42:10 thorpej Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -29,45 +29,45 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * 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.
+ *
  * from: Utah $Hdr: machdep.c 1.63 91/04/24$
+ *
  *	@(#)machdep.c	7.16 (Berkeley) 6/3/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.183 2020/06/11 19:20:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.184 2021/01/03 17:42:10 thorpej Exp $");
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
 #include "opt_mbtype.h"
 #include "opt_modular.h"
 #include "opt_panicbutton.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/mbuf.h>
 #include <sys/msgbuf.h>
 #include <sys/vnode.h>
 #include <sys/queue.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 #include <sys/ksyms.h>
 #include <sys/module.h>
 #include <sys/intr.h>
 #include <sys/exec.h>
 #include <sys/exec_aout.h>
 #include <sys/cpu.h>
 #include <sys/exec_elf.h>
 @@ -620,27 +620,27 @@ add_sicallback(void (*function)(void *,
 	struct si_callback *si;
 	int s;
 	/*
 	 * this function may be called from high-priority interrupt handlers.
 	 * We may NOT block for  memory-allocation in here!.
 	 */
 	s = splhigh();
 	if ((si = si_free) != NULL)
 		si_free = si->next;
 	splx(s);
 	if (si == NULL) {
-		si = malloc(sizeof(*si), M_TEMP, M_NOWAIT);
+		si = kmem_intr_alloc(sizeof(*si), KM_NOSLEEP);
 #ifdef DIAGNOSTIC
 		if (si)
 			++ncbd;		/* count # dynamically allocated */
 #endif
 		if (si == NULL)
 			return;
+	}
 	si->function = function;
 	si->rock1    = rock1;
 	si->rock2    = rock2;
 	s = splhigh();

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mainbus.c,v 1.12 2019/11/10 21:16:25 chs Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.13 2021/01/03 17:42:10 thorpej Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Leo Weppelman.
+ *
  * 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.
 @@ -20,32 +20,32 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12 2019/11/10 21:16:25 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.13 2021/01/03 17:42:10 thorpej Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <machine/cpu.h>
 #include <sys/bus.h>
 static int		mb_bus_space_peek_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t);
 static int		mb_bus_space_peek_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t);
 static int		mb_bus_space_peek_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t);
 static int		mb_bus_space_peek_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t);
 static uint8_t		mb_bus_space_read_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t);
 @@ -157,28 +157,27 @@ static void		mb_bus_space_set_region_8(b
     *((volatile uint16_t *)(calc_addr(h, o, (t)->stride, (t)->wo_2))) = v
 #define __write_4(t, h, o, v)	\
     *((volatile uint32_t *)(calc_addr(h, o, (t)->stride, (t)->wo_4))) = v
 #define __write_8(t, h, o, v)	\
     *((volatile uint64_t *)(calc_addr(h, o, (t)->stride, (t)->wo_8))) = v
 bus_space_tag_t
 mb_alloc_bus_space_tag(void)
+{
 	bus_space_tag_t	mb_t;
-	/* Not really M_TEMP, is it.. */
+	mb_t = kmem_zalloc(sizeof(*mb_t), KM_SLEEP);
 	mb_t = malloc(sizeof(*mb_t), M_TEMP, M_WAITOK|M_ZERO);
 	mb_t->abs_p_1   = mb_bus_space_peek_1;
 	mb_t->abs_p_2   = mb_bus_space_peek_2;
 	mb_t->abs_p_4   = mb_bus_space_peek_4;
 	mb_t->abs_p_8   = mb_bus_space_peek_8;
 	mb_t->abs_r_1   = mb_bus_space_read_1;
 	mb_t->abs_r_2   = mb_bus_space_read_2;
 	mb_t->abs_r_4   = mb_bus_space_read_4;
 	mb_t->abs_r_8   = mb_bus_space_read_8;
 	mb_t->abs_rs_1  = mb_bus_space_read_1;
 	mb_t->abs_rs_2  = mb_bus_space_read_2;
 	mb_t->abs_rs_4  = mb_bus_space_read_4;
 	mb_t->abs_rs_8  = mb_bus_space_read_8;
 	mb_t->abs_rm_1  = mb_bus_space_read_multi_1;
 @@ -227,28 +226,27 @@ mb_alloc_bus_space_tag(void)
 	mb_t->abs_sm_8  = mb_bus_space_set_multi_8;
 	mb_t->abs_sr_1  = mb_bus_space_set_region_1;
 	mb_t->abs_sr_2  = mb_bus_space_set_region_2;
 	mb_t->abs_sr_4  = mb_bus_space_set_region_4;
 	mb_t->abs_sr_8  = mb_bus_space_set_region_8;
 	return mb_t;
+}
 void
 mb_free_bus_space_tag(bus_space_tag_t mb_t)
+{
-	/* Not really M_TEMP, is it.. */
+	kmem_free(mb_t, sizeof(*mb_t));
 	free(mb_t, M_TEMP);
+}
 static int
 mb_bus_space_peek_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
+{
 	return !badbaddr((void *)(calc_addr(h, o, t->stride, t->wo_1)), 1);
+}
 static int
 mb_bus_space_peek_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hdfd.c,v 1.86 2019/11/10 21:16:25 chs Exp $	*/
+/*	$NetBSD: hdfd.c,v 1.87 2021/01/03 17:42:10 thorpej Exp $	*/
 /*-
  * Copyright (c) 1996 Leo Weppelman
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Don Ahn.
+ *
  * 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
 @@ -81,42 +81,42 @@
  * use ..." clause:
+ *
  * Copyright (c) 1993, 1994 by
  *  jc@irbs.UUCP (John Capo)
  *  vak@zebub.msk.su (Serge Vakulenko)
  *  ache@astral.msk.su (Andrew A. Chernov)
+ *
  * Copyright (c) 1993, 1994, 1995 by
  *  joerg_wunsch@uriah.sax.de (Joerg Wunsch)
  *  dufault@hda.com (Peter Dufault)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.86 2019/11/10 21:16:25 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.87 2021/01/03 17:42:10 thorpej Exp $");
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/uio.h>
 #include <sys/syslog.h>
 #include <sys/queue.h>
 #include <sys/proc.h>
 #include <sys/fdio.h>
 #include <sys/conf.h>
 #include <uvm/uvm_extern.h>
 #include <machine/cpu.h>
 #include <sys/bus.h>
 #include <machine/iomap.h>
 #include <machine/mfp.h>
 @@ -1416,52 +1416,51 @@ fdioctl(dev_t dev, u_long cmd, void *add
 	case FDIOCFORMAT_TRACK:
 		if ((flag & FWRITE) == 0)
 			return EBADF;	/* must be opened for writing */
 		form_cmd = (struct fdformat_cmd *)addr;
 		if (form_cmd->formatcmd_version != FDFORMAT_VERSION)
 			return EINVAL;	/* wrong version of formatting prog */
 		if (form_cmd->head >= fd->sc_type->heads ||
 		    form_cmd->cylinder >= fd->sc_type->tracks) {
 			return EINVAL;
+		}
-		fd_formb = malloc(sizeof(struct ne7_fd_formb),
+		fd_formb = kmem_alloc(sizeof(*fd_formb), KM_SLEEP);
 		    M_TEMP, M_WAITOK);
 		fd_formb->head = form_cmd->head;
 		fd_formb->cyl = form_cmd->cylinder;
 		fd_formb->transfer_rate = fd->sc_type->rate;
 		fd_formb->fd_formb_secshift = fd->sc_type->secsize;
 		fd_formb->fd_formb_nsecs = fd->sc_type->sectrac;
 		fd_formb->fd_formb_gaplen = fd->sc_type->gap2;
 		fd_formb->fd_formb_fillbyte = fd->sc_type->fillbyte;
 		memset(il, 0,sizeof il);
 		for (j = 0, i = 1; i <= fd_formb->fd_formb_nsecs; i++) {
 			while (il[(j%fd_formb->fd_formb_nsecs)+1])
 				j++;
 			il[(j%fd_formb->fd_formb_nsecs)+1] = i;
 			j += fd->sc_type->interleave;
+		}
 		for (i = 0; i < fd_formb->fd_formb_nsecs; i++) {
 			fd_formb->fd_formb_cylno(i) = form_cmd->cylinder;
 			fd_formb->fd_formb_headno(i) = form_cmd->head;
 			fd_formb->fd_formb_secno(i) = il[i+1];
 			fd_formb->fd_formb_secsize(i) = fd->sc_type->secsize;
+		}
 		error = fdformat(dev, fd_formb, l->l_proc);
-		free(fd_formb, M_TEMP);
+		kmem_free(fd_formb, sizeof(*fd_formb));
 		return error;
 	case FDIOCGETOPTS:		/* get drive options */
 		*(int *)addr = fd->sc_opts;
 		return 0;
 	case FDIOCSETOPTS:		/* set drive options */
 		fd->sc_opts = *(int *)addr;
 		return 0;
 	default:
 		return ENOTTY;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ite.c,v 1.79 2019/06/29 16:41:19 tsutsui Exp $	*/
+/*	$NetBSD: ite.c,v 1.80 2021/01/03 17:42:10 thorpej Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -34,35 +34,35 @@
  * SUCH DAMAGE.
+ *
  *      from: Utah Hdr: ite.c 1.1 90/07/09
  *      from: @(#)ite.c 7.6 (Berkeley) 5/16/91
  */
 /*
  * ite - bitmapped terminal.
  * Supports VT200, a few terminal features will be unavailable until
  * the system actually probes the device (i.e. not after consinit())
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.79 2019/06/29 16:41:19 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.80 2021/01/03 17:42:10 thorpej Exp $");
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/termios.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/proc.h>
 #include <dev/cons.h>
 #include <sys/kauth.h>
 #include <machine/cpu.h>
 #include <atari/atari/device.h>
 @@ -351,39 +351,39 @@ itecnputc(dev_t dev, int c)
  * an ite device, it is also called from itecninit().
+ *
  */
 void
 iteinit(dev_t dev)
+{
 	struct ite_softc	*sc;
 	sc = getitesp(dev);
 	if (sc->flags & ITE_INITED)
 		return;
 	if (atari_realconfig) {
 		if (sc->kbdmap && sc->kbdmap != &ascii_kbdmap)
-			free(sc->kbdmap, M_DEVBUF);
+			kmem_free(sc->kbdmap, sizeof(*sc->kbdmap));
-		sc->kbdmap = malloc(sizeof(struct kbdmap), M_DEVBUF, M_WAITOK);
+		sc->kbdmap = kmem_alloc(sizeof(*sc->kbdmap), KM_SLEEP);
 		memcpy(sc->kbdmap, &ascii_kbdmap, sizeof(struct kbdmap));
+	}
 	else
 		sc->kbdmap = &ascii_kbdmap;
 	sc->cursorx = 0;
 	sc->cursory = 0;
 	SUBR_INIT(sc);
 	SUBR_CURSOR(sc, DRAW_CURSOR);
 	if (sc->tabs == NULL)
-		sc->tabs = malloc(MAX_TABS * sizeof(u_char),M_DEVBUF,M_WAITOK);
+		sc->tabs = kmem_alloc(MAX_TABS * sizeof(u_char), KM_SLEEP);
 	ite_reset(sc);
 	sc->flags |= ITE_INITED;
+}
 int
 iteopen(dev_t dev, int mode, int devtype, struct lwp *l)
+{
 	struct ite_softc *sc;
 	struct tty *tp;
 	int error, first, unit;
 	unit = ITEUNIT(dev);
 	if (unit >= ite_cd.cd_ndevs)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: md_root.c,v 1.34 2018/09/03 16:29:24 riastradh Exp $	*/
+/*	$NetBSD: md_root.c,v 1.35 2021/01/03 17:42:10 thorpej Exp $	*/
 /*
  * Copyright (c) 1996 Leo Weppelman.
  * 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.
 @@ -16,32 +16,32 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: md_root.c,v 1.34 2018/09/03 16:29:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md_root.c,v 1.35 2021/01/03 17:42:10 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/conf.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 #include <sys/dkbad.h>
 #include <dev/cons.h>
 #include <dev/md.h>
 @@ -119,33 +119,33 @@ md_attach_hook(int unit, struct md_conf
+}
 void
 md_open_hook(int unit, struct md_conf *md)
+{
 	struct ramd_info *ri;
 	if (unit >= RAMD_NDEV)
 		return;
 	ri = &rd_info[unit];
 	if (md->md_type != MD_UNCONFIGURED)
 		return;	/* Only configure once */
-	md->md_addr = malloc(ri->ramd_size, M_DEVBUF, M_WAITOK);
+	md->md_addr = kmem_alloc(ri->ramd_size, KM_SLEEP);
 	md->md_size = ri->ramd_size;
 	if (md->md_addr == NULL)
 		return;
 	if (ri->ramd_flag & RAMD_LOAD) {
 		if (loaddisk(md, ri->ramd_dev, curlwp)) {
-			free(md->md_addr, M_DEVBUF);
+			kmem_free(md->md_addr, ri->ramd_size);
 			md->md_addr = NULL;
 			return;
+		}
+	}
 	md->md_type = MD_KMEM_ALLOCATED;
+}
 static int
 loaddisk(struct md_conf *md, dev_t ld_dev, struct lwp *lwp)
+{
 	struct buf		*buf;
 	int			error;
 	const struct bdevsw	*bdp;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: zs.c,v 1.78 2018/02/08 09:05:17 dholland Exp $	*/
+/*	$NetBSD: zs.c,v 1.79 2021/01/03 17:42:10 thorpej Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
 @@ -69,36 +69,36 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Zilog Z8530 (ZSCC) driver.
+ *
  * Runs two tty ports (modem2 and serial2) on zs0.
+ *
  * This driver knows far too much about chip to usage mappings.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.78 2018/02/08 09:05:17 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.79 2021/01/03 17:42:10 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/tty.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <sys/kauth.h>
 #include <machine/cpu.h>
 #include <machine/iomap.h>
 #include <machine/scu.h>
 #include <machine/mfp.h>
 #include <atari/dev/ym2149reg.h>
 #include <dev/ic/z8530reg.h>
 @@ -399,28 +399,28 @@ zsopen(dev_t dev, int flags, int mode, s
 	sc = device_lookup_private(&zs_cd, zs);
 	if (sc == NULL)
 		return ENXIO;
 	cs = sc->sc_cs[unit & 1];
 	/*
 	 * When port A (ser02) is selected on the TT, make sure
 	 * the port is enabled.
 	 */
 	if ((machineid & ATARI_TT) && !(unit & 1))
 		ym2149_ser2(1);
 	if (cs->cs_rbuf == NULL) {
-		cs->cs_rbuf = malloc(ZLRB_RING_SIZE * sizeof(int), M_DEVBUF,
+		cs->cs_rbuf = kmem_alloc(ZLRB_RING_SIZE * sizeof(int),
-		    M_WAITOK);
+		    KM_SLEEP);
+	}
 	tp = cs->cs_ttyp;
 	if (tp == NULL) {
 		cs->cs_ttyp = tp = tty_alloc();
 		tty_attach(tp);
 		tp->t_dev   = dev;
 		tp->t_oproc = zsstart;
 		tp->t_param = zsparam;
+	}
 	if (kauth_authorize_device_tty(l->l_cred, KAUTH_DEVICE_TTY_OPEN, tp))
 		return EBUSY;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci_machdep.c,v 1.58 2019/05/04 08:30:06 tsutsui Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.59 2021/01/03 17:42:10 thorpej Exp $	*/
 /*
  * Copyright (c) 1996 Leo Weppelman.  All rights reserved.
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
  * Copyright (c) 1994 Charles M. Hannum.  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
 @@ -22,37 +22,37 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.58 2019/05/04 08:30:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.59 2021/01/03 17:42:10 thorpej Exp $");
 #include "opt_mbtype.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #define _ATARI_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 #include <uvm/uvm_extern.h>
 #include <machine/cpu.h>
 #include <machine/iomap.h>
 #include <machine/mfp.h>
 @@ -357,54 +357,52 @@ enable_pci_devices(void)
 		/*
 		 * special case: if a display card is found and memory is
 		 * enabled preserve 128k at 0xa0000 as vga memory.
 		 * XXX: if a display card is found without being enabled,
 		 * leave it alone! You will usually only create conflicts
 		 * by enabeling it.
 		 */
 		class = pci_conf_read(pc, tag, PCI_CLASS_REG);
 		switch (PCI_CLASS(class)) {
 		case PCI_CLASS_PREHISTORIC:
 		case PCI_CLASS_DISPLAY:
 			if (csr & (PCI_COMMAND_MEM_ENABLE |
 			    PCI_COMMAND_MASTER_ENABLE)) {
-				p = malloc(sizeof(struct pci_memreg),
+				p = kmem_zalloc(sizeof(struct pci_memreg),
-				    M_TEMP, M_WAITOK);
+				    KM_SLEEP);
 				memset(p, 0, sizeof(struct pci_memreg));
 				p->dev = dev;
 				p->csr = csr;
 				p->tag = tag;
 				p->reg = 0;	/* there is no register
 						   about this */
 				p->size = 0x20000; /* 128kByte */
 				p->mask = 0xfffe0000;
 				p->address = 0xa0000;
 				insert_into_list(&memlist, p);
 			} else
 				continue;
+		}
 		for (reg = PCI_MAPREG_START; reg < PCI_MAPREG_END; reg += 4) {
 			address = pci_conf_read(pc, tag, reg);
 			pci_conf_write(pc, tag, reg, 0xffffffff);
 			mask    = pci_conf_read(pc, tag, reg);
 			pci_conf_write(pc, tag, reg, address);
 			if (mask == 0)
 				continue; /* Register unused */
-			p = malloc(sizeof(struct pci_memreg),
+			p = kmem_zalloc(sizeof(struct pci_memreg),
-			    M_TEMP, M_WAITOK);
+			    KM_SLEEP);
 			memset(p, 0, sizeof(struct pci_memreg));
 			p->dev = dev;
 			p->csr = csr;
 			p->tag = tag;
 			p->reg = reg;
 			p->mask = mask;
 			p->address = 0;
 			if ((mask & PCI_MAPREG_TYPE_IO) != 0) {
 				p->size = PCI_MAPREG_IO_SIZE(mask);
 				/*
 				 * Align IO if necessary
 				 */
 @@ -626,34 +624,34 @@ enable_pci_devices(void)
 		printf("\ndev: %d, reg: 0x%02x, size: 0x%08x, addr: 0x%08x",
 		    p->dev, p->reg, p->size, p->address);
 		p = LIST_NEXT(p, link);
+	}
 #endif
 	/*
 	 * Free the lists
 	 */
 	p = LIST_FIRST(&iolist);
 	while (p != NULL) {
 		q = p;
 		LIST_REMOVE(q, link);
-		free(p, M_WAITOK);
+		kmem_free(p, sizeof(*p));
 		p = LIST_FIRST(&iolist);
+	}
 	p = LIST_FIRST(&memlist);
 	while (p != NULL) {
 		q = p;
 		LIST_REMOVE(q, link);
-		free(p, M_WAITOK);
+		kmem_free(p, sizeof(*p));
 		p = LIST_FIRST(&memlist);
+	}
+}
 pcitag_t
 pci_make_tag(pci_chipset_tag_t pc, int bus, int device, int function)
+{
 	return (bus << 16) | (device << 11) | (function << 8);
+}
 void
 pci_decompose_tag(pci_chipset_tag_t pc, pcitag_t tag, int *bp, int *dp, int *fp)