 @@ -1,14 +1,14 @@
-/* $NetBSD: qv.c,v 1.35 2020/06/14 01:40:06 chs Exp $ */
+/* $NetBSD: qv.c,v 1.36 2020/11/21 22:37:11 thorpej Exp $ */
 /*
  * Copyright (c) 2015 Charles H. Dickman. All rights reserved.
  * Derived from smg.c
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * 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
 @@ -21,36 +21,36 @@
  * 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.
  */
 /*       1         2         3         4         5         6         7        */
 /*3456789012345678901234567890123456789012345678901234567890123456789012345678*/
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qv.c,v 1.35 2020/06/14 01:40:06 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qv.c,v 1.36 2020/11/21 22:37:11 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/conf.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/extent.h>		/***/
 #include <sys/time.h>
 #include <sys/bus.h>
 #include <vax/include/pte.h>                /* temporary */
 #include <machine/sid.h>
 #include <dev/cons.h>
 #include <dev/qbus/ubavar.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wscons_callbacks.h>
 #include <dev/wsfont/wsfont.h>
 #include <dev/wsfb/genfbvar.h>
 #include <vax/include/sgmap.h> /***/
 @@ -890,43 +890,43 @@ qv_mmap(void *v, void *vs, off_t offset,
 	return (sc->sc_fbphys) >> PGSHIFT;
+}
 /*
  * emulop allocate screen
  */
 int
 qv_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep,
     int *curxp, int *curyp, long *defattrp)
+{
         struct qv_softc *sc = device_private(v);
         struct qv_screen *ss;
-	ss = malloc(sizeof(struct qv_screen), M_DEVBUF, M_WAITOK|M_ZERO);
+	ss = kmem_zalloc(sizeof(struct qv_screen), KM_SLEEP);
 	ss->ss_sc = sc;
 	ss->ss_type = type;
 	*cookiep = ss;
 	*curxp = *curyp = *defattrp = 0;
         printf("qv_alloc_screen: \"%s\" %p\n", type->name, ss);
 	return 0;
+}
 /*
  * emulop free screen
  */
 void
 qv_free_screen(void *v, void *cookie)
+{
         printf("qv_free_screen: %p\n", cookie);
-        free(cookie, M_DEVBUF);
+        kmem_free(cookie, sizeof(struct qv_screen));
+}
 /*
  * emulop show screen
  */
 int
 qv_show_screen(void *v, void *cookie, int waitok,
     void (*cb)(void *, int, int), void *cbarg)
+{
 	struct qv_screen *ss = cookie;
 	const struct _wsscreen_descr *descr;
 	int row, col, line;
         printf("qv_show_screen: %p\n", cookie);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: qvkbd.c,v 1.2 2019/11/10 21:16:33 chs Exp $	*/
+/*	$NetBSD: qvkbd.c,v 1.3 2020/11/21 22:37:11 thorpej Exp $	*/
 /* Copyright (c) 2015 Charles H. Dickman. All rights reserved.
  * Derived from dzkbd.c
+ *
  * 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:
 @@ -44,27 +44,27 @@
 /*
  * LK200/LK400 keyboard attached to line 0 of the QVSS aux port
  */
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0, "$$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/syslog.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/intr.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wskbdvar.h>
 #include <dev/wscons/wsksymdef.h>
 #include <dev/wscons/wsksymvar.h>
 #include <dev/dec/wskbdmap_lk201.h>
 #include <sys/bus.h>
 #include <vax/uba/qvareg.h>
 #include <vax/uba/qvavar.h>
 #include <vax/uba/qvkbdvar.h>
 @@ -161,28 +161,27 @@ qvkbd_attach(device_t parent, device_t s
 	struct qvkbd_internal *qvi;
 	struct wskbddev_attach_args a;
 	int isconsole;
 	qvaux->sc_qvaux[daa->daa_line].qvaux_catch = qvkbd_input;
 	qvaux->sc_qvaux[daa->daa_line].qvaux_private = qvkbd;
 	ls = &qvaux->sc_qvaux[daa->daa_line];
 	isconsole = (daa->daa_flags & QVAUXKBD_CONSOLE);
 	if (isconsole) {
 		qvi = &qvkbd_console_internal;
 	} else {
-		qvi = malloc(sizeof(struct qvkbd_internal),
+		qvi = kmem_alloc(sizeof(struct qvkbd_internal), KM_SLEEP);
 				       M_DEVBUF, M_WAITOK);
 		qvi->qvi_ks.attmt.sendchar = qvkbd_sendchar;
 		qvi->qvi_ks.attmt.cookie = ls;
+	}
 	qvi->qvi_ls = ls;
 	qvkbd->sc_itl = qvi;
 	printf("\n");
 	if (!isconsole) {
 		DELAY(100000);
 		lk201_init(&qvi->qvi_ks);
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_dma.c,v 1.35 2018/04/27 07:53:07 maxv Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.36 2020/11/21 22:37:11 thorpej Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 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.
+ *
  * 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
 @@ -25,94 +25,99 @@
  * 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.
  */
 /*
  * bus_dma routines for vax. File copied from arm32/bus_dma.c.
  * NetBSD: bus_dma.c,v 1.11 1998/09/21 22:53:35 thorpej Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.35 2018/04/27 07:53:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.36 2020/11/21 22:37:11 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.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/malloc.h>
+#include <sys/kmem.h>
 #include <sys/mbuf.h>
 #include <sys/vnode.h>
 #include <sys/device.h>
 #include <uvm/uvm.h>
 #define _VAX_BUS_DMA_PRIVATE
 #include <machine/bus.h>
 #include <machine/ka43.h>
 #include <machine/sid.h>
 extern	paddr_t avail_start, avail_end;
 extern  vaddr_t virtual_avail;
 int	_bus_dmamap_load_buffer(bus_dma_tag_t, bus_dmamap_t, void *,
 	    bus_size_t, struct vmspace *, int, vaddr_t *, int *, bool);
 int	_bus_dma_inrange(bus_dma_segment_t *, int, bus_addr_t);
 int	_bus_dmamem_alloc_range(bus_dma_tag_t, bus_size_t, bus_size_t,
 	    bus_size_t, bus_dma_segment_t*, int, int *, int, vaddr_t, vaddr_t);
 static size_t
 _bus_dmamap_mapsize(int const nsegments)
+{
 	KASSERT(nsegments > 0);
 	return sizeof(struct vax_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 vax_bus_dmamap *map;
 	void *mapstore;
 	size_t mapsize;
 #ifdef DEBUG_DMA
 	printf("dmamap_create: t=%p size=%lx nseg=%x msegsz=%lx boundary=%lx flags=%x\n",
 	    t, size, nsegments, maxsegsz, boundary, flags);
 #endif	/* DEBUG_DMA */
 	/*
 	 * 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 vax_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 vax_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;
 #ifdef DEBUG_DMA
 	printf("dmamap_create:map=%p\n", map);
 @@ -125,27 +130,27 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
  * DMA map destruction functions.
  */
 void
 _bus_dmamap_destroy(bus_dma_tag_t t, bus_dmamap_t map)
+{
 #ifdef DEBUG_DMA
 	printf("dmamap_destroy: t=%p map=%p\n", t, map);
 #endif	/* DEBUG_DMA */
 #ifdef DIAGNOSTIC
 	if (map->dm_nsegs > 0)
 		printf("bus_dmamap_destroy() called for map with valid mappings\n");
 #endif	/* DIAGNOSTIC */
-	free(map, M_DEVBUF);
+	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)
+{
 	vaddr_t lastaddr = 0;
 	int seg, error;
 	struct vmspace *vm;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: multicpu.c,v 1.35 2019/11/10 21:16:33 chs Exp $	*/
+/*	$NetBSD: multicpu.c,v 1.36 2020/11/21 22:37:11 thorpej Exp $	*/
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden. 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.
+ *
 @@ -19,34 +19,34 @@
  * 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.
  */
 /*
  * CPU-type independent code to spin up other VAX CPU's.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: multicpu.c,v 1.35 2019/11/10 21:16:33 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: multicpu.c,v 1.36 2020/11/21 22:37:11 thorpej Exp $");
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/proc.h>
 #include <sys/xcall.h>
 #include <sys/ipi.h>
 #include <uvm/uvm_extern.h>
 #include <vax/vax/gencons.h>
 #include "ioconf.h"
 const struct cpu_mp_dep *mp_dep_call;
 struct cpuq {
 @@ -58,63 +58,63 @@ struct cpuq {
 SIMPLEQ_HEAD(, cpuq) cpuq = SIMPLEQ_HEAD_INITIALIZER(cpuq);
 extern long avail_start, avail_end;
 struct cpu_info_qh cpus = SIMPLEQ_HEAD_INITIALIZER(cpus);
 void
 cpu_boot_secondary_processors(void)
+{
 	struct cpuq *q;
 	while ((q = SIMPLEQ_FIRST(&cpuq))) {
 		SIMPLEQ_REMOVE_HEAD(&cpuq, cq_q);
 		(*mp_dep_call->cpu_startslave)(q->cq_ci);
-		free(q, M_TEMP);
+		kmem_free(q, sizeof(*q));
+	}
+}
 /*
  * Allocate a cpu_info struct and fill it in then prepare for getting
  * started by cpu_boot_secondary_processors().
  */
 void
 cpu_slavesetup(device_t self, int slotid)
+{
 	struct cpu_info *ci;
 	struct cpuq *cq;
 	struct vm_page *pg;
 	vaddr_t istackbase;
 	KASSERT(device_private(self) == NULL);
-	ci = malloc(sizeof(*ci), M_DEVBUF, M_ZERO|M_WAITOK);
+	ci = kmem_zalloc(sizeof(*ci), KM_SLEEP);
 	self->dv_private = ci;
 	ci->ci_dev = self;
 	ci->ci_slotid = slotid;
 	ci->ci_cpuid = device_unit(self);
 	/* Allocate an interrupt stack */
 	pg = uvm_pagealloc(NULL, 0, NULL, 0);
 	if (pg == NULL)
 		panic("cpu_slavesetup2");
 	istackbase = VM_PAGE_TO_PHYS(pg) | KERNBASE;
 	kvtopte(istackbase)->pg_v = 0; /* istack safety belt */
 	/* Populate the PCB and the cpu_info struct */
 	ci->ci_istack = istackbase + PAGE_SIZE;
 	SIMPLEQ_INSERT_TAIL(&cpus, ci, ci_next);
-	cq = malloc(sizeof(*cq), M_TEMP, M_WAITOK|M_ZERO);
+	cq = kmem_zalloc(sizeof(*cq), KM_SLEEP);
 	cq->cq_ci = ci;
 	cq->cq_dev = ci->ci_dev;
 	SIMPLEQ_INSERT_TAIL(&cpuq, cq, cq_q);
 	mi_cpu_attach(ci);	/* let the MI parts know about the new cpu */
+}
 /*
  * Send an IPI of type type to the CPU with logical device number cpu.
  */
 void
 cpu_send_ipi(int cpu, int type)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lcg.c,v 1.4 2018/06/06 01:49:08 maya Exp $ */
+/*	$NetBSD: lcg.c,v 1.5 2020/11/21 22:37:11 thorpej Exp $ */
 /*
  * LCG accelerated framebuffer driver
  * Copyright (c) 2003, 2004 Blaz Antonic
  * 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.
 @@ -24,36 +24,36 @@
  * 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.
  */
 /*
  * Resurrection and dumb framebuffer mode by Björn Johannesson
  * rherdware@yahoo.com in December 2014
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lcg.c,v 1.4 2018/06/06 01:49:08 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lcg.c,v 1.5 2020/11/21 22:37:11 thorpej Exp $");
 #define LCG_NO_ACCEL
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/time.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <machine/vsbus.h>
 #include <machine/sid.h>
 #include <machine/cpu.h>
 #include <machine/lcgreg.h>
 #include <dev/cons.h>
 #include <dev/dec/dzreg.h>
 #include <dev/dec/dzvar.h>
 @@ -779,27 +779,27 @@ lcg_mmap(void *v, void *vs, off_t offset
+{
 	if (offset >= lcg_fb_size || offset < 0)
 		return -1;
 	return (LCG_FB_ADDR + offset) >> PGSHIFT;
+}
 int
 lcg_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep,
     int *curxp, int *curyp, long *defattrp)
+{
 	int i;
 	struct lcg_screen *ss;
-	*cookiep = malloc(sizeof(struct lcg_screen), M_DEVBUF, M_WAITOK);
+	*cookiep = kmem_alloc(sizeof(struct lcg_screen), KM_SLEEP);
 	bzero(*cookiep, sizeof(struct lcg_screen));
 	*curxp = *curyp = 0;
 	*defattrp = (LCG_BG_COLOR << 4) | LCG_FG_COLOR;
 	ss = *cookiep;
 	for (i = 0; i < lcg_cols * lcg_rows; ++i)
 		ss->ss_image[i].attr = (LCG_BG_COLOR << 4) | LCG_FG_COLOR;
 	return 0;
+}
 void
 lcg_free_screen(void *v, void *cookie)
+{
+}

 @@ -1,50 +1,50 @@
-/*	$NetBSD: smg.c,v 1.58 2019/03/14 23:49:38 thorpej Exp $ */
+/*	$NetBSD: smg.c,v 1.59 2020/11/21 22:37:11 thorpej Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * 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.
+ *
  * 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: smg.c,v 1.58 2019/03/14 23:49:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smg.c,v 1.59 2020/11/21 22:37:11 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/conf.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/time.h>
 #include <machine/vsbus.h>
 #include <machine/sid.h>
 #include <machine/ka420.h>
 #include <dev/cons.h>
 #include <dev/dec/dzreg.h>
 #include <dev/dec/dzvar.h>
 #include <dev/dec/dzkbdvar.h>
 #include <dev/wscons/wsdisplayvar.h>
 @@ -522,27 +522,27 @@ smg_ioctl(void *v, void *vs, u_long cmd,
 static paddr_t
 smg_mmap(void *v, void *vs, off_t offset, int prot)
+{
 	if (offset >= SMSIZE || offset < 0)
 		return -1;
 	return (SMADDR + offset) >> PGSHIFT;
+}
 int
 smg_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep,
     int *curxp, int *curyp, long *defattrp)
+{
-	*cookiep = malloc(sizeof(struct smg_screen), M_DEVBUF, M_WAITOK|M_ZERO);
+	*cookiep = kmem_zalloc(sizeof(struct smg_screen), KM_SLEEP);
 	*curxp = *curyp = *defattrp = 0;
 	return 0;
+}
 void
 smg_free_screen(void *v, void *cookie)
+{
+}
 int
 smg_show_screen(void *v, void *cookie, int waitok,
     void (*cb)(void *, int, int), void *cbarg)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: spx.c,v 1.9 2016/07/07 06:55:39 msaitoh Exp $ */
+/*	$NetBSD: spx.c,v 1.10 2020/11/21 22:37:11 thorpej Exp $ */
 /*
  * SPX/LCSPX/SPXg/SPXgt accelerated framebuffer driver for NetBSD/VAX
  * Copyright (c) 2005 Blaz Antonic
  * All rights reserved.
+ *
  * This software contains code written by Michael L. Hitch.
+ *
  * 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
 @@ -22,35 +22,35 @@
  * 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: spx.c,v 1.9 2016/07/07 06:55:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spx.c,v 1.10 2020/11/21 22:37:11 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/conf.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/time.h>
 #include <machine/vsbus.h>
 #include <machine/sid.h>
 #include <machine/ka420.h>
 #include <dev/cons.h>
 #include <dev/dec/dzreg.h>
 #include <dev/dec/dzvar.h>
 #include <dev/dec/dzkbdvar.h>
 #include <dev/wscons/wsdisplayvar.h>
 @@ -1045,42 +1045,42 @@ spx_mmap(void *v, void *vs, off_t offset
 	if (offset >= spx_fb_size || offset < 0)
 		return -1;
 	return (SPX_FB_ADDR + offset) >> PGSHIFT;
+}
 static int
 spx_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep,
 		 int *curxp, int *curyp, long *defattrp)
+{
 	int i;
 	struct spx_screen *ss;
-	ss = malloc(sizeof(struct spx_screen), M_DEVBUF, M_WAITOK | M_ZERO);
+	ss = kmem_zalloc(sizeof(struct spx_screen), KM_SLEEP);
 	*cookiep = ss;
 	*curxp = *curyp = 0;
 	*defattrp = (SPX_BG_COLOR << 4) | SPX_FG_COLOR;
 	for (i = 0; i < spx_cols * spx_rows; ++i)
 		ss->ss_image[i].attr = *defattrp;
 	return 0;
+}
 static void
 spx_free_screen(void *v, void *cookie)
+{
-/* FIXME add something to actually free malloc()ed screen? */
+/* FIXME add something to actually free kmem_zalloc()ed screen? */
+}
 static int
 spx_show_screen(void *v, void *cookie, int waitok,
 		void (*cb)(void *, int, int), void *cbarg)
+{
 	struct spx_screen *ss = cookie;
 	u_int row, col, attr;
 	u_char c;
 	if (ss == curscr)
 		return (0);