From 23e63c4b5cecc703250c97faac1ad970f4954821 Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Wed, 20 Dec 2023 00:40:42 +0000
Subject: [PATCH] Remove unnecessary <sys/malloc.h> include.

---
 sys/arch/amiga/amiga/machdep.c        | 5 ++---
 sys/arch/amiga/amiga/pmap_bootstrap.c | 5 ++---
 sys/arch/amiga/dev/acafh.c            | 5 ++---
 sys/arch/amiga/dev/clock.c            | 5 ++---
 sys/arch/amiga/dev/efa.c              | 3 +--
 sys/arch/amiga/dev/grf.c              | 5 ++---
 sys/arch/amiga/dev/grf_cl.c           | 5 ++---
 sys/arch/amiga/dev/grf_et.c           | 5 ++---
 sys/arch/amiga/dev/grf_ul.c           | 5 ++---
 sys/arch/amiga/dev/if_ne_xsh.c        | 3 +--
 sys/arch/amiga/dev/if_ne_xsurf.c      | 3 +--
 sys/arch/amiga/dev/if_ne_zbus.c       | 5 ++---
 sys/arch/amiga/dev/sbicvar.h          | 4 ++--
 sys/arch/amiga/dev/slhci_zbus.c       | 5 ++---
 sys/arch/amiga/dev/wdc_acafh.c        | 5 ++---
 sys/arch/amiga/dev/wdc_amiga.c        | 5 ++---
 sys/arch/amiga/dev/wdc_buddha.c       | 3 +--
 sys/arch/amiga/dev/xsh.c              | 5 ++---
 sys/arch/amiga/dev/xsurf.c            | 5 ++---
 sys/arch/amiga/dev/z3rambd.c          | 5 ++---
 sys/arch/amiga/pci/cv3dpb.c           | 3 +--
 sys/arch/amiga/pci/em4k.c             | 3 +--
 sys/arch/amiga/pci/emmem.c            | 3 +--
 sys/arch/amiga/pci/empb.c             | 3 +--
 sys/arch/amiga/pci/mppb.c             | 3 +--
 sys/arch/amiga/pci/p5membar.c         | 3 +--
 sys/arch/amiga/pci/p5pb.c             | 3 +--
 sys/arch/amiga/pci/pci_machdep.c      | 3 +--
 sys/arch/atari/atari/pmap_bootstrap.c | 3 +--
 sys/arch/atari/dev/fd.c               | 5 ++---
 sys/arch/atari/dev/grf.c              | 5 ++---
 sys/arch/atari/dev/grfabs.c           | 7 +++----
 sys/arch/atari/dev/wdc_mb.c           | 5 ++---
 sys/arch/atari/isa/isapnp_machdep.c   | 5 ++---
 sys/arch/atari/vme/et4000.c           | 5 ++---
 sys/arch/atari/vme/vme.c              | 5 ++---
 sys/arch/cesfic/cesfic/autoconf.c     | 5 ++---
 sys/arch/cesfic/cesfic/machdep.c      | 5 ++---
 sys/arch/hp300/dev/rtc.c              | 5 ++---
 sys/arch/luna68k/luna68k/machdep.c    | 5 ++---
 sys/arch/m68k/m68k/core_machdep.c     | 5 ++---
 sys/arch/m68k/m68k/pmap_motorola.c    | 5 ++---
 sys/arch/m68k/m68k/sunos_machdep.c    | 5 ++---
 sys/arch/m68k/m68k/vm_machdep.c       | 5 ++---
 sys/arch/mac68k/mac68k/intr.c         | 5 ++---
 sys/arch/mac68k/mac68k/iop.c          | 5 ++---
 sys/arch/mac68k/nubus/grf_nubus.c     | 5 ++---
 sys/arch/mac68k/nubus/if_ae_nubus.c   | 5 ++---
 sys/arch/mac68k/obio/if_mc_obio.c     | 5 ++---
 sys/arch/mvme68k/dev/memc_68k.c       | 5 ++---
 sys/arch/mvme68k/dev/vme_pcc.c        | 5 ++---
 sys/arch/mvme68k/mvme68k/bus_space.c  | 5 ++---
 sys/arch/mvme68k/mvme68k/machdep.c    | 5 ++---
 sys/arch/news68k/news68k/machdep.c    | 5 ++---
 sys/arch/next68k/dev/mb8795.c         | 5 ++---
 sys/arch/next68k/dev/nextcons.c       | 5 ++---
 sys/arch/next68k/dev/nextdma.c        | 5 ++---
 sys/arch/next68k/next68k/machdep.c    | 5 ++---
 sys/arch/x68k/dev/grf.c               | 5 ++---
 sys/arch/x68k/dev/mfp.c               | 5 ++---
 sys/arch/x68k/dev/rtclock.c           | 5 ++---
 sys/arch/x68k/x68k/clock.c            | 5 ++---
 sys/arch/x68k/x68k/machdep.c          | 5 ++---
 63 files changed, 114 insertions(+), 176 deletions(-)

diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c
index 247b368e843b..7e8e1dd499e9 100644
--- a/sys/arch/amiga/amiga/machdep.c
+++ b/sys/arch/amiga/amiga/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.252 2020/05/05 21:22:48 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.253 2023/12/20 00:40:42 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -50,7 +50,7 @@
 #include "empm.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.252 2020/05/05 21:22:48 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.253 2023/12/20 00:40:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -62,7 +62,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.252 2020/05/05 21:22:48 ad Exp $");
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/file.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/msgbuf.h>
 #include <sys/vnode.h>
diff --git a/sys/arch/amiga/amiga/pmap_bootstrap.c b/sys/arch/amiga/amiga/pmap_bootstrap.c
index 816dc48aa523..f0dc28b92756 100644
--- a/sys/arch/amiga/amiga/pmap_bootstrap.c
+++ b/sys/arch/amiga/amiga/pmap_bootstrap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.10 2016/12/22 14:47:54 cherry Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.11 2023/12/20 00:40:42 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -65,12 +65,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.10 2016/12/22 14:47:54 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.11 2023/12/20 00:40:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/malloc.h>
 
 #include <uvm/uvm.h>
 
diff --git a/sys/arch/amiga/dev/acafh.c b/sys/arch/amiga/dev/acafh.c
index a6ea390352ac..b58c6e3f1d7d 100644
--- a/sys/arch/amiga/dev/acafh.c
+++ b/sys/arch/amiga/dev/acafh.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: acafh.c,v 1.6 2023/08/04 08:39:44 rin Exp $ */
+/*	$NetBSD: acafh.c,v 1.7 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acafh.c,v 1.6 2023/08/04 08:39:44 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acafh.c,v 1.7 2023/12/20 00:40:42 thorpej Exp $");
 
 /*
  * Individual Computers ACA500 driver. 
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: acafh.c,v 1.6 2023/08/04 08:39:44 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
diff --git a/sys/arch/amiga/dev/clock.c b/sys/arch/amiga/dev/clock.c
index b6c48b1fe620..392e87d42ee4 100644
--- a/sys/arch/amiga/dev/clock.c
+++ b/sys/arch/amiga/dev/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.58 2020/07/03 16:23:03 maxv Exp $ */
+/*	$NetBSD: clock.c,v 1.59 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.58 2020/07/03 16:23:03 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.59 2023/12/20 00:40:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -392,7 +392,6 @@ calibrate_delay(device_t self)
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
 #include <sys/ioctl.h>
-#include <sys/malloc.h>
 #include <uvm/uvm_extern.h>
 #include <amiga/amiga/clockioctl.h>
 #include <sys/specdev.h>
diff --git a/sys/arch/amiga/dev/efa.c b/sys/arch/amiga/dev/efa.c
index 7bc6908548b1..5379aa5056b1 100644
--- a/sys/arch/amiga/dev/efa.c
+++ b/sys/arch/amiga/dev/efa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: efa.c,v 1.16 2023/05/06 21:34:39 andvar Exp $ */
+/*	$NetBSD: efa.c,v 1.17 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -41,7 +41,6 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <sys/proc.h>
diff --git a/sys/arch/amiga/dev/grf.c b/sys/arch/amiga/dev/grf.c
index 9d0d3af82219..8bc8993f4717 100644
--- a/sys/arch/amiga/dev/grf.c
+++ b/sys/arch/amiga/dev/grf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf.c,v 1.68 2022/05/24 20:50:18 andvar Exp $ */
+/*	$NetBSD: grf.c,v 1.69 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.68 2022/05/24 20:50:18 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.69 2023/12/20 00:40:42 thorpej Exp $");
 
 /*
  * Graphics display driver for the Amiga
@@ -57,7 +57,6 @@ __KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.68 2022/05/24 20:50:18 andvar Exp $");
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/file.h>
-#include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
 #include <sys/mman.h>
diff --git a/sys/arch/amiga/dev/grf_cl.c b/sys/arch/amiga/dev/grf_cl.c
index 283f018ad95d..322122c9b0b7 100644
--- a/sys/arch/amiga/dev/grf_cl.c
+++ b/sys/arch/amiga/dev/grf_cl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_cl.c,v 1.57 2023/08/27 19:48:19 andvar Exp $ */
+/*	$NetBSD: grf_cl.c,v 1.58 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*
  * Copyright (c) 1997 Klaus Burkert
@@ -36,7 +36,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1.57 2023/08/27 19:48:19 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1.58 2023/12/20 00:40:42 thorpej Exp $");
 
 #include "grfcl.h"
 #include "ite.h"
@@ -79,7 +79,6 @@ __KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1.57 2023/08/27 19:48:19 andvar Exp $");
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/device_impl.h>	/* XXX autoconf abuse */
-#include <sys/malloc.h>
 
 #include <machine/cpu.h>
 #include <dev/cons.h>
diff --git a/sys/arch/amiga/dev/grf_et.c b/sys/arch/amiga/dev/grf_et.c
index f07a4ecd2a9e..8496851479aa 100644
--- a/sys/arch/amiga/dev/grf_et.c
+++ b/sys/arch/amiga/dev/grf_et.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_et.c,v 1.40 2022/03/28 12:38:57 riastradh Exp $ */
+/*	$NetBSD: grf_et.c,v 1.41 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*
  * Copyright (c) 1997 Klaus Burkert
@@ -37,7 +37,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_et.c,v 1.40 2022/03/28 12:38:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_et.c,v 1.41 2023/12/20 00:40:42 thorpej Exp $");
 
 #include "grfet.h"
 #include "ite.h"
@@ -70,7 +70,6 @@ __KERNEL_RCSID(0, "$NetBSD: grf_et.c,v 1.40 2022/03/28 12:38:57 riastradh Exp $"
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/device_impl.h>	/* XXX autoconf abuse */
-#include <sys/malloc.h>
 
 #include <machine/cpu.h>
 #include <dev/cons.h>
diff --git a/sys/arch/amiga/dev/grf_ul.c b/sys/arch/amiga/dev/grf_ul.c
index b55326d3dfb6..cc6b3a937771 100644
--- a/sys/arch/amiga/dev/grf_ul.c
+++ b/sys/arch/amiga/dev/grf_ul.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_ul.c,v 1.55 2023/08/28 09:22:26 andvar Exp $ */
+/*	$NetBSD: grf_ul.c,v 1.56 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_ul.c,v 1.55 2023/08/28 09:22:26 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_ul.c,v 1.56 2023/12/20 00:40:42 thorpej Exp $");
 
 #include "grful.h"
 #include "ite.h"
@@ -47,7 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: grf_ul.c,v 1.55 2023/08/28 09:22:26 andvar Exp $");
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/device_impl.h>	/* XXX autoconf abuse */
-#include <sys/malloc.h>
 #include <sys/syslog.h>
 
 #include <machine/cpu.h>
diff --git a/sys/arch/amiga/dev/if_ne_xsh.c b/sys/arch/amiga/dev/if_ne_xsh.c
index 6adfa0ae791a..5ceb7369a941 100644
--- a/sys/arch/amiga/dev/if_ne_xsh.c
+++ b/sys/arch/amiga/dev/if_ne_xsh.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ne_xsh.c,v 1.4 2013/08/13 15:43:25 rkujawa Exp $ */
+/*	$NetBSD: if_ne_xsh.c,v 1.5 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -37,7 +37,6 @@
 
 #include <sys/param.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
diff --git a/sys/arch/amiga/dev/if_ne_xsurf.c b/sys/arch/amiga/dev/if_ne_xsurf.c
index c7ac489edc60..4b5f7de1a853 100644
--- a/sys/arch/amiga/dev/if_ne_xsurf.c
+++ b/sys/arch/amiga/dev/if_ne_xsurf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ne_xsurf.c,v 1.1 2012/05/15 17:35:44 rkujawa Exp $ */
+/*	$NetBSD: if_ne_xsurf.c,v 1.2 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,6 @@
 
 #include <sys/param.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
diff --git a/sys/arch/amiga/dev/if_ne_zbus.c b/sys/arch/amiga/dev/if_ne_zbus.c
index 20fd11ace55d..534bb8492456 100644
--- a/sys/arch/amiga/dev/if_ne_zbus.c
+++ b/sys/arch/amiga/dev/if_ne_zbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ne_zbus.c,v 1.16 2012/05/15 17:35:44 rkujawa Exp $ */
+/*	$NetBSD: if_ne_zbus.c,v 1.17 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_zbus.c,v 1.16 2012/05/15 17:35:44 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_zbus.c,v 1.17 2023/12/20 00:40:42 thorpej Exp $");
 
 /*
  * Thanks to Village Tronic for giving me a card.
@@ -39,7 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ne_zbus.c,v 1.16 2012/05/15 17:35:44 rkujawa Exp
 
 #include <sys/param.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
diff --git a/sys/arch/amiga/dev/sbicvar.h b/sys/arch/amiga/dev/sbicvar.h
index d2684918a06e..47c56ab394bf 100644
--- a/sys/arch/amiga/dev/sbicvar.h
+++ b/sys/arch/amiga/dev/sbicvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: sbicvar.h,v 1.26 2022/01/01 21:07:13 andvar Exp $	*/
+/*	$NetBSD: sbicvar.h,v 1.27 2023/12/20 00:40:42 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
  */
 #ifndef _SBICVAR_H_
 #define _SBICVAR_H_
-#include <sys/malloc.h>
+
 #include <sys/callout.h>
 
 /*
diff --git a/sys/arch/amiga/dev/slhci_zbus.c b/sys/arch/amiga/dev/slhci_zbus.c
index 39fd65c96033..46e53db53d22 100644
--- a/sys/arch/amiga/dev/slhci_zbus.c
+++ b/sys/arch/amiga/dev/slhci_zbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: slhci_zbus.c,v 1.2 2016/04/23 10:15:27 skrll Exp $ */
+/*	$NetBSD: slhci_zbus.c,v 1.3 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: slhci_zbus.c,v 1.2 2016/04/23 10:15:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slhci_zbus.c,v 1.3 2023/12/20 00:40:42 thorpej Exp $");
 
 /*
  * Thylacine driver.
@@ -39,7 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: slhci_zbus.c,v 1.2 2016/04/23 10:15:27 skrll Exp $")
 
 #include <sys/param.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 
diff --git a/sys/arch/amiga/dev/wdc_acafh.c b/sys/arch/amiga/dev/wdc_acafh.c
index fcc5736ced7c..1ecba8ad8146 100644
--- a/sys/arch/amiga/dev/wdc_acafh.c
+++ b/sys/arch/amiga/dev/wdc_acafh.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc_acafh.c,v 1.6 2017/10/20 07:06:06 jdolecek Exp $ */
+/*	$NetBSD: wdc_acafh.c,v 1.7 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2000, 2003, 2013 The NetBSD Foundation, Inc.
@@ -41,12 +41,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_acafh.c,v 1.6 2017/10/20 07:06:06 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_acafh.c,v 1.7 2023/12/20 00:40:42 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 
diff --git a/sys/arch/amiga/dev/wdc_amiga.c b/sys/arch/amiga/dev/wdc_amiga.c
index dd546dbf32cb..2db95361c347 100644
--- a/sys/arch/amiga/dev/wdc_amiga.c
+++ b/sys/arch/amiga/dev/wdc_amiga.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc_amiga.c,v 1.40 2017/10/20 07:06:06 jdolecek Exp $ */
+/*	$NetBSD: wdc_amiga.c,v 1.41 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2000, 2003 The NetBSD Foundation, Inc.
@@ -30,12 +30,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_amiga.c,v 1.40 2017/10/20 07:06:06 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_amiga.c,v 1.41 2023/12/20 00:40:42 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 
diff --git a/sys/arch/amiga/dev/wdc_buddha.c b/sys/arch/amiga/dev/wdc_buddha.c
index a5e1c358b17e..cc57b0868523 100644
--- a/sys/arch/amiga/dev/wdc_buddha.c
+++ b/sys/arch/amiga/dev/wdc_buddha.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc_buddha.c,v 1.10 2017/10/20 07:06:06 jdolecek Exp $	*/
+/*	$NetBSD: wdc_buddha.c,v 1.11 2023/12/20 00:40:42 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,6 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 
diff --git a/sys/arch/amiga/dev/xsh.c b/sys/arch/amiga/dev/xsh.c
index 81e4a64f44d5..6d28a3e31049 100644
--- a/sys/arch/amiga/dev/xsh.c
+++ b/sys/arch/amiga/dev/xsh.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: xsh.c,v 1.4 2021/08/07 16:18:42 thorpej Exp $ */
+/*	$NetBSD: xsh.c,v 1.5 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xsh.c,v 1.4 2021/08/07 16:18:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xsh.c,v 1.5 2023/12/20 00:40:42 thorpej Exp $");
 
 /*
  * X-Surf 100 driver. 
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: xsh.c,v 1.4 2021/08/07 16:18:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
diff --git a/sys/arch/amiga/dev/xsurf.c b/sys/arch/amiga/dev/xsurf.c
index 1df96e457722..904a9675ed57 100644
--- a/sys/arch/amiga/dev/xsurf.c
+++ b/sys/arch/amiga/dev/xsurf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: xsurf.c,v 1.5 2021/08/07 16:18:42 thorpej Exp $ */
+/*	$NetBSD: xsurf.c,v 1.6 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xsurf.c,v 1.5 2021/08/07 16:18:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xsurf.c,v 1.6 2023/12/20 00:40:42 thorpej Exp $");
 
 /*
  * X-Surf driver, split from ne_zbus. 
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: xsurf.c,v 1.5 2021/08/07 16:18:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
diff --git a/sys/arch/amiga/dev/z3rambd.c b/sys/arch/amiga/dev/z3rambd.c
index df5ae5764e3b..e14de264d637 100644
--- a/sys/arch/amiga/dev/z3rambd.c
+++ b/sys/arch/amiga/dev/z3rambd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: z3rambd.c,v 1.5 2021/08/07 16:18:42 thorpej Exp $ */
+/*	$NetBSD: z3rambd.c,v 1.6 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: z3rambd.c,v 1.5 2021/08/07 16:18:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: z3rambd.c,v 1.6 2023/12/20 00:40:42 thorpej Exp $");
 
 /*
  * Z3 RAM virtual block device. Supports ZorRAM, BigRamPlus and FastLane Z3 so 
@@ -39,7 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: z3rambd.c,v 1.5 2021/08/07 16:18:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 
diff --git a/sys/arch/amiga/pci/cv3dpb.c b/sys/arch/amiga/pci/cv3dpb.c
index 455b65b8ef51..cdde979b6ed2 100644
--- a/sys/arch/amiga/pci/cv3dpb.c
+++ b/sys/arch/amiga/pci/cv3dpb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cv3dpb.c,v 1.6 2021/08/07 16:18:42 thorpej Exp $ */
+/*	$NetBSD: cv3dpb.c,v 1.7 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2011, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,6 @@
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 
 #include <uvm/uvm_extern.h>
 
diff --git a/sys/arch/amiga/pci/em4k.c b/sys/arch/amiga/pci/em4k.c
index 834bc368cff7..cb3e87cae412 100644
--- a/sys/arch/amiga/pci/em4k.c
+++ b/sys/arch/amiga/pci/em4k.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: em4k.c,v 1.8 2021/08/07 16:18:42 thorpej Exp $ */
+/*	$NetBSD: em4k.c,v 1.9 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -37,7 +37,6 @@
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/kmem.h>
 
 #include <uvm/uvm_extern.h>
diff --git a/sys/arch/amiga/pci/emmem.c b/sys/arch/amiga/pci/emmem.c
index 5e3d317b1e10..83d70163e8cd 100644
--- a/sys/arch/amiga/pci/emmem.c
+++ b/sys/arch/amiga/pci/emmem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: emmem.c,v 1.5 2020/06/17 06:39:49 thorpej Exp $ */
+/*	$NetBSD: emmem.c,v 1.6 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -39,7 +39,6 @@
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 
 #include <uvm/uvm_extern.h>
 
diff --git a/sys/arch/amiga/pci/empb.c b/sys/arch/amiga/pci/empb.c
index b24b2097148e..5a2ef2ac68fe 100644
--- a/sys/arch/amiga/pci/empb.c
+++ b/sys/arch/amiga/pci/empb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: empb.c,v 1.15 2021/08/07 16:18:42 thorpej Exp $ */
+/*	$NetBSD: empb.c,v 1.16 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,6 @@
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/kmem.h>
 
 #include <uvm/uvm_extern.h>
diff --git a/sys/arch/amiga/pci/mppb.c b/sys/arch/amiga/pci/mppb.c
index 5f6e33a49fde..b5348eb0762b 100644
--- a/sys/arch/amiga/pci/mppb.c
+++ b/sys/arch/amiga/pci/mppb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mppb.c,v 1.12 2021/08/07 16:18:42 thorpej Exp $ */
+/*	$NetBSD: mppb.c,v 1.13 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -37,7 +37,6 @@
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/kmem.h>
 
 #include <uvm/uvm_extern.h>
diff --git a/sys/arch/amiga/pci/p5membar.c b/sys/arch/amiga/pci/p5membar.c
index c4f8c0bd9fae..a3143b4a6010 100644
--- a/sys/arch/amiga/pci/p5membar.c
+++ b/sys/arch/amiga/pci/p5membar.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: p5membar.c,v 1.4 2020/06/17 06:40:45 thorpej Exp $ */
+/*	$NetBSD: p5membar.c,v 1.5 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -40,7 +40,6 @@
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 
 #include <uvm/uvm_extern.h>
 
diff --git a/sys/arch/amiga/pci/p5pb.c b/sys/arch/amiga/pci/p5pb.c
index 6e101167bf55..0dc6c67bd3c2 100644
--- a/sys/arch/amiga/pci/p5pb.c
+++ b/sys/arch/amiga/pci/p5pb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: p5pb.c,v 1.20 2023/08/26 22:12:45 andvar Exp $ */
+/*	$NetBSD: p5pb.c,v 1.21 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2011, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,6 @@
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/kmem.h>
 
 #include <uvm/uvm_extern.h>
diff --git a/sys/arch/amiga/pci/pci_machdep.c b/sys/arch/amiga/pci/pci_machdep.c
index 1e41080d6251..da6c33cbe4a6 100644
--- a/sys/arch/amiga/pci/pci_machdep.c
+++ b/sys/arch/amiga/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.c,v 1.4 2020/06/17 06:41:39 thorpej Exp $ */
+/*	$NetBSD: pci_machdep.c,v 1.5 2023/12/20 00:40:42 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -37,7 +37,6 @@
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/kmem.h>
 
 #include <uvm/uvm_extern.h>
diff --git a/sys/arch/atari/atari/pmap_bootstrap.c b/sys/arch/atari/atari/pmap_bootstrap.c
index db0107206204..f49e59a9dc77 100644
--- a/sys/arch/atari/atari/pmap_bootstrap.c
+++ b/sys/arch/atari/atari/pmap_bootstrap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.10 2023/01/06 10:28:27 tsutsui Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.11 2023/12/20 00:40:42 thorpej Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -68,7 +68,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/malloc.h>
 
 #include <uvm/uvm.h>
 
diff --git a/sys/arch/atari/dev/fd.c b/sys/arch/atari/dev/fd.c
index 72befc0659c7..3a350c8ee708 100644
--- a/sys/arch/atari/dev/fd.c
+++ b/sys/arch/atari/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.97 2023/08/30 18:20:40 andvar Exp $	*/
+/*	$NetBSD: fd.c,v 1.98 2023/12/20 00:40:42 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -44,13 +44,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.97 2023/08/30 18:20:40 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.98 2023/12/20 00:40:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/proc.h>
diff --git a/sys/arch/atari/dev/grf.c b/sys/arch/atari/dev/grf.c
index 983bf1ce38f8..4f7f560ae46d 100644
--- a/sys/arch/atari/dev/grf.c
+++ b/sys/arch/atari/dev/grf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf.c,v 1.56 2023/01/06 10:28:28 tsutsui Exp $	*/
+/*	$NetBSD: grf.c,v 1.57 2023/12/20 00:40:42 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -46,14 +46,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.56 2023/01/06 10:28:28 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.57 2023/12/20 00:40:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/file.h>
-#include <sys/malloc.h>
 #include <sys/conf.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
diff --git a/sys/arch/atari/dev/grfabs.c b/sys/arch/atari/dev/grfabs.c
index ec5a8e07096b..0e8b7512c89a 100644
--- a/sys/arch/atari/dev/grfabs.c
+++ b/sys/arch/atari/dev/grfabs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grfabs.c,v 1.19 2023/01/06 10:28:28 tsutsui Exp $	*/
+/*	$NetBSD: grfabs.c,v 1.20 2023/12/20 00:40:42 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -30,12 +30,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grfabs.c,v 1.19 2023/01/06 10:28:28 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grfabs.c,v 1.20 2023/12/20 00:40:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
-#include <sys/malloc.h>
 
 #include <machine/cpu.h>
 #include <machine/iomap.h>
@@ -55,7 +54,7 @@ static MODES modes;
 
 /*
  * Ugh.. Stuff needed to allocate console structures before the VM-system
- * is running. There is no malloc() available at that time.
+ * is running.
  * Decision to use these: atari_realconfig == 0
  */
 view_t		gra_con_view;
diff --git a/sys/arch/atari/dev/wdc_mb.c b/sys/arch/atari/dev/wdc_mb.c
index aaf0647579df..50fe95fbcaca 100644
--- a/sys/arch/atari/dev/wdc_mb.c
+++ b/sys/arch/atari/dev/wdc_mb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc_mb.c,v 1.42 2023/01/06 10:28:28 tsutsui Exp $	*/
+/*	$NetBSD: wdc_mb.c,v 1.43 2023/12/20 00:40:42 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -30,12 +30,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_mb.c,v 1.42 2023/01/06 10:28:28 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_mb.c,v 1.43 2023/12/20 00:40:42 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
 
 #include <sys/bswap.h>
diff --git a/sys/arch/atari/isa/isapnp_machdep.c b/sys/arch/atari/isa/isapnp_machdep.c
index fa3d6b244f3e..462e53910d8f 100644
--- a/sys/arch/atari/isa/isapnp_machdep.c
+++ b/sys/arch/atari/isa/isapnp_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isapnp_machdep.c,v 1.10 2011/07/01 20:34:06 dyoung Exp $	*/
+/*	$NetBSD: isapnp_machdep.c,v 1.11 2023/12/20 00:40:43 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -74,12 +74,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.10 2011/07/01 20:34:06 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.11 2023/12/20 00:40:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 
 #include <sys/bus.h>
 
diff --git a/sys/arch/atari/vme/et4000.c b/sys/arch/atari/vme/et4000.c
index 06fd2fa584ee..0fb9e6fa9fb7 100644
--- a/sys/arch/atari/vme/et4000.c
+++ b/sys/arch/atari/vme/et4000.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: et4000.c,v 1.28 2023/01/06 10:28:28 tsutsui Exp $	*/
+/*	$NetBSD: et4000.c,v 1.29 2023/12/20 00:40:43 thorpej Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -45,12 +45,11 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: et4000.c,v 1.28 2023/01/06 10:28:28 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: et4000.c,v 1.29 2023/12/20 00:40:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/queue.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/arch/atari/vme/vme.c b/sys/arch/atari/vme/vme.c
index 3b22ec105d11..532cc1990b72 100644
--- a/sys/arch/atari/vme/vme.c
+++ b/sys/arch/atari/vme/vme.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vme.c,v 1.20 2022/06/26 05:11:54 tsutsui Exp $	*/
+/*	$NetBSD: vme.c,v 1.21 2023/12/20 00:40:43 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,13 +27,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.20 2022/06/26 05:11:54 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.21 2023/12/20 00:40:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
 
 #include <machine/intr.h>
diff --git a/sys/arch/cesfic/cesfic/autoconf.c b/sys/arch/cesfic/cesfic/autoconf.c
index 97103f022f7f..d31b37ddb651 100644
--- a/sys/arch/cesfic/cesfic/autoconf.c
+++ b/sys/arch/cesfic/cesfic/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.29 2021/08/07 16:18:47 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.30 2023/12/20 00:40:43 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1997, 1999
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.29 2021/08/07 16:18:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.30 2023/12/20 00:40:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -35,7 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.29 2021/08/07 16:18:47 thorpej Exp $"
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
-#include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/queue.h>
 #include <sys/reboot.h>
diff --git a/sys/arch/cesfic/cesfic/machdep.c b/sys/arch/cesfic/cesfic/machdep.c
index f5845053f609..270bf9c0f04d 100644
--- a/sys/arch/cesfic/cesfic/machdep.c
+++ b/sys/arch/cesfic/cesfic/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.72 2021/10/09 20:00:41 tsutsui Exp $	*/
+/*	$NetBSD: machdep.c,v 1.73 2023/12/20 00:40:43 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.72 2021/10/09 20:00:41 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.73 2023/12/20 00:40:43 thorpej Exp $");
 
 #include "opt_bufcache.h"
 #include "opt_ddb.h"
@@ -59,7 +59,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.72 2021/10/09 20:00:41 tsutsui Exp $")
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mount.h>
 #include <sys/msgbuf.h>
diff --git a/sys/arch/hp300/dev/rtc.c b/sys/arch/hp300/dev/rtc.c
index 071824acadb5..d9f86964526e 100644
--- a/sys/arch/hp300/dev/rtc.c
+++ b/sys/arch/hp300/dev/rtc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtc.c,v 1.22 2023/01/15 06:19:45 tsutsui Exp $	*/
+/*	$NetBSD: rtc.c,v 1.23 2023/12/20 00:40:43 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,12 +43,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.22 2023/01/15 06:19:45 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.23 2023/12/20 00:40:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 
 #include <hp300/dev/intiovar.h>
 #include <hp300/dev/rtcreg.h>
diff --git a/sys/arch/luna68k/luna68k/machdep.c b/sys/arch/luna68k/luna68k/machdep.c
index 92c0f5d9dd0b..70199cc78069 100644
--- a/sys/arch/luna68k/luna68k/machdep.c
+++ b/sys/arch/luna68k/luna68k/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.109 2023/09/17 10:14:49 andvar Exp $ */
+/* $NetBSD: machdep.c,v 1.110 2023/12/20 00:40:43 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.109 2023/09/17 10:14:49 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.110 2023/12/20 00:40:43 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -49,7 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.109 2023/09/17 10:14:49 andvar Exp $")
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/msgbuf.h>
 #include <sys/ioctl.h>
diff --git a/sys/arch/m68k/m68k/core_machdep.c b/sys/arch/m68k/m68k/core_machdep.c
index 2d58069e17ec..c68b22aa9151 100644
--- a/sys/arch/m68k/m68k/core_machdep.c
+++ b/sys/arch/m68k/m68k/core_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: core_machdep.c,v 1.7 2019/11/20 19:37:52 pgoyette Exp $	*/
+/*	$NetBSD: core_machdep.c,v 1.8 2023/12/20 00:40:43 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,12 +39,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.7 2019/11/20 19:37:52 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.8 2023/12/20 00:40:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/core.h>
diff --git a/sys/arch/m68k/m68k/pmap_motorola.c b/sys/arch/m68k/m68k/pmap_motorola.c
index 1c772b75c248..ce23f4262fc4 100644
--- a/sys/arch/m68k/m68k/pmap_motorola.c
+++ b/sys/arch/m68k/m68k/pmap_motorola.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_motorola.c,v 1.79 2023/09/26 14:33:55 tsutsui Exp $        */
+/*	$NetBSD: pmap_motorola.c,v 1.80 2023/12/20 00:40:43 thorpej Exp $        */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -119,12 +119,11 @@
 #include "opt_m68k_arch.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.79 2023/09/26 14:33:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.80 2023/12/20 00:40:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/cpu.h>
 #include <sys/atomic.h>
diff --git a/sys/arch/m68k/m68k/sunos_machdep.c b/sys/arch/m68k/m68k/sunos_machdep.c
index d39ba36ab2ae..466bd7af9ff3 100644
--- a/sys/arch/m68k/m68k/sunos_machdep.c
+++ b/sys/arch/m68k/m68k/sunos_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sunos_machdep.c,v 1.39 2023/09/26 14:33:55 tsutsui Exp $	*/
+/*	$NetBSD: sunos_machdep.c,v 1.40 2023/12/20 00:40:43 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos_machdep.c,v 1.39 2023/09/26 14:33:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_machdep.c,v 1.40 2023/12/20 00:40:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -51,7 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: sunos_machdep.c,v 1.39 2023/09/26 14:33:55 tsutsui E
 #include <sys/kernel.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
-#include <sys/malloc.h>
 #include <sys/buf.h>
 
 #include <sys/syscallargs.h>
diff --git a/sys/arch/m68k/m68k/vm_machdep.c b/sys/arch/m68k/m68k/vm_machdep.c
index 47a5bf8fd612..c38983d4ba54 100644
--- a/sys/arch/m68k/m68k/vm_machdep.c
+++ b/sys/arch/m68k/m68k/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.40 2023/09/26 14:33:55 tsutsui Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.41 2023/12/20 00:40:43 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,13 +39,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.40 2023/09/26 14:33:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.41 2023/12/20 00:40:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/cpu.h>
-#include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/core.h>
diff --git a/sys/arch/mac68k/mac68k/intr.c b/sys/arch/mac68k/mac68k/intr.c
index 8efeb760b0db..cf1794f05e12 100644
--- a/sys/arch/mac68k/mac68k/intr.c
+++ b/sys/arch/mac68k/mac68k/intr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.32 2021/04/02 12:11:41 rin Exp $	*/
+/*	$NetBSD: intr.c,v 1.33 2023/12/20 00:40:43 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -34,11 +34,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.32 2021/04/02 12:11:41 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.33 2023/12/20 00:40:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/vmmeter.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
diff --git a/sys/arch/mac68k/mac68k/iop.c b/sys/arch/mac68k/mac68k/iop.c
index 48638d1729cd..c6a448b20746 100644
--- a/sys/arch/mac68k/mac68k/iop.c
+++ b/sys/arch/mac68k/mac68k/iop.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iop.c,v 1.11 2007/03/12 18:18:25 ad Exp $	*/
+/*	$NetBSD: iop.c,v 1.12 2023/12/20 00:40:43 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000 Allen Briggs.
@@ -32,13 +32,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.11 2007/03/12 18:18:25 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.12 2023/12/20 00:40:43 thorpej Exp $");
 
 #include "opt_mac68k.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/queue.h>
 #include <sys/systm.h>
diff --git a/sys/arch/mac68k/nubus/grf_nubus.c b/sys/arch/mac68k/nubus/grf_nubus.c
index 906a69aff3f1..a202d7f482ee 100644
--- a/sys/arch/mac68k/nubus/grf_nubus.c
+++ b/sys/arch/mac68k/nubus/grf_nubus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_nubus.c,v 1.78 2016/02/28 19:39:27 rjs Exp $	*/
+/*	$NetBSD: grf_nubus.c,v 1.79 2023/12/20 00:40:43 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995 Allen Briggs.  All rights reserved.
@@ -30,14 +30,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_nubus.c,v 1.78 2016/02/28 19:39:27 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_nubus.c,v 1.79 2023/12/20 00:40:43 thorpej Exp $");
 
 #include <sys/param.h>
 
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
-#include <sys/malloc.h>
 #include <sys/mman.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
diff --git a/sys/arch/mac68k/nubus/if_ae_nubus.c b/sys/arch/mac68k/nubus/if_ae_nubus.c
index 6acc167f90eb..30bbdc89bf6b 100644
--- a/sys/arch/mac68k/nubus/if_ae_nubus.c
+++ b/sys/arch/mac68k/nubus/if_ae_nubus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ae_nubus.c,v 1.43 2020/02/05 08:36:56 skrll Exp $	*/
+/*	$NetBSD: if_ae_nubus.c,v 1.44 2023/12/20 00:40:43 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1997 Scott Reynolds
@@ -40,13 +40,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ae_nubus.c,v 1.43 2020/02/05 08:36:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ae_nubus.c,v 1.44 2023/12/20 00:40:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
-#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
diff --git a/sys/arch/mac68k/obio/if_mc_obio.c b/sys/arch/mac68k/obio/if_mc_obio.c
index aee5c50e8779..c7b7f24a7db5 100644
--- a/sys/arch/mac68k/obio/if_mc_obio.c
+++ b/sys/arch/mac68k/obio/if_mc_obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mc_obio.c,v 1.19 2021/01/24 05:20:23 rin Exp $	*/
+/*	$NetBSD: if_mc_obio.c,v 1.20 2023/12/20 00:40:43 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997 David Huang <khym@azeotrope.org>
@@ -36,13 +36,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mc_obio.c,v 1.19 2021/01/24 05:20:23 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mc_obio.c,v 1.20 2023/12/20 00:40:43 thorpej Exp $");
 
 #include "opt_ddb.h"
 
 #include <sys/param.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 
diff --git a/sys/arch/mvme68k/dev/memc_68k.c b/sys/arch/mvme68k/dev/memc_68k.c
index 070ccc611ec2..003b3690e7ee 100644
--- a/sys/arch/mvme68k/dev/memc_68k.c
+++ b/sys/arch/mvme68k/dev/memc_68k.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: memc_68k.c,v 1.8 2012/10/27 17:18:04 chs Exp $	*/
+/*	$NetBSD: memc_68k.c,v 1.9 2023/12/20 00:40:44 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2002 The NetBSD Foundation, Inc.
@@ -34,13 +34,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: memc_68k.c,v 1.8 2012/10/27 17:18:04 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: memc_68k.c,v 1.9 2023/12/20 00:40:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 
 #include <machine/cpu.h>
 #include <machine/bus.h>
diff --git a/sys/arch/mvme68k/dev/vme_pcc.c b/sys/arch/mvme68k/dev/vme_pcc.c
index 503daecbabfb..2cc17f2749b5 100644
--- a/sys/arch/mvme68k/dev/vme_pcc.c
+++ b/sys/arch/mvme68k/dev/vme_pcc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vme_pcc.c,v 1.26 2012/10/27 17:18:04 chs Exp $	*/
+/*	$NetBSD: vme_pcc.c,v 1.27 2023/12/20 00:40:44 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996-2000 The NetBSD Foundation, Inc.
@@ -38,13 +38,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_pcc.c,v 1.26 2012/10/27 17:18:04 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_pcc.c,v 1.27 2023/12/20 00:40:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/kcore.h>
 
 #include <machine/cpu.h>
diff --git a/sys/arch/mvme68k/mvme68k/bus_space.c b/sys/arch/mvme68k/mvme68k/bus_space.c
index ee78bd516ece..028faff6fa67 100644
--- a/sys/arch/mvme68k/mvme68k/bus_space.c
+++ b/sys/arch/mvme68k/mvme68k/bus_space.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_space.c,v 1.10 2008/04/28 20:23:29 martin Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.11 2023/12/20 00:40:44 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -35,11 +35,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.10 2008/04/28 20:23:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.11 2023/12/20 00:40:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 
 #include <machine/cpu.h>
 #include <machine/pte.h>
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index ea124c936809..39865ef1475b 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.160 2023/03/26 19:10:33 andvar Exp $	*/
+/*	$NetBSD: machdep.c,v 1.161 2023/12/20 00:40:44 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.160 2023/03/26 19:10:33 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.161 2023/12/20 00:40:44 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_m060sp.h"
@@ -56,7 +56,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.160 2023/03/26 19:10:33 andvar Exp $")
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/file.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/msgbuf.h>
 #include <sys/ioctl.h>
diff --git a/sys/arch/news68k/news68k/machdep.c b/sys/arch/news68k/news68k/machdep.c
index 7c57bef224a5..b83289ba1b55 100644
--- a/sys/arch/news68k/news68k/machdep.c
+++ b/sys/arch/news68k/news68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.111 2023/10/08 03:57:47 tsutsui Exp $	*/
+/*	$NetBSD: machdep.c,v 1.112 2023/12/20 00:40:44 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.111 2023/10/08 03:57:47 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.112 2023/12/20 00:40:44 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
@@ -51,7 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.111 2023/10/08 03:57:47 tsutsui Exp $"
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mount.h>
 #include <sys/msgbuf.h>
diff --git a/sys/arch/next68k/dev/mb8795.c b/sys/arch/next68k/dev/mb8795.c
index 2bff8b367440..2b9d0a531312 100644
--- a/sys/arch/next68k/dev/mb8795.c
+++ b/sys/arch/next68k/dev/mb8795.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mb8795.c,v 1.70 2023/02/03 23:00:33 tsutsui Exp $	*/
+/*	$NetBSD: mb8795.c,v 1.71 2023/12/20 00:40:44 thorpej Exp $	*/
 /*
  * Copyright (c) 1998 Darrin B. Jewell
  * All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.70 2023/02/03 23:00:33 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.71 2023/12/20 00:40:44 thorpej Exp $");
 
 #include "opt_inet.h"
 
@@ -35,7 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.70 2023/02/03 23:00:33 tsutsui Exp $");
 #include <sys/syslog.h>
 #include <sys/socket.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/rndsource.h>
diff --git a/sys/arch/next68k/dev/nextcons.c b/sys/arch/next68k/dev/nextcons.c
index 5328bea98542..eaea6c6a640e 100644
--- a/sys/arch/next68k/dev/nextcons.c
+++ b/sys/arch/next68k/dev/nextcons.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nextcons.c,v 1.14 2023/02/11 02:33:27 tsutsui Exp $	*/
+/*	$NetBSD: nextcons.c,v 1.15 2023/12/20 00:40:44 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1999 Darrin B. Jewell
@@ -26,14 +26,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nextcons.c,v 1.14 2023/02/11 02:33:27 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextcons.c,v 1.15 2023/12/20 00:40:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/errno.h>
 #include <sys/queue.h>
 #include <sys/bus.h>
diff --git a/sys/arch/next68k/dev/nextdma.c b/sys/arch/next68k/dev/nextdma.c
index d9f30d1591e3..cee82a1ab9fc 100644
--- a/sys/arch/next68k/dev/nextdma.c
+++ b/sys/arch/next68k/dev/nextdma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nextdma.c,v 1.51 2023/02/03 23:06:42 tsutsui Exp $	*/
+/*	$NetBSD: nextdma.c,v 1.52 2023/12/20 00:40:44 thorpej Exp $	*/
 /*
  * Copyright (c) 1998 Darrin B. Jewell
  * All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nextdma.c,v 1.51 2023/02/03 23:06:42 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextdma.c,v 1.52 2023/12/20 00:40:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -33,7 +33,6 @@ __KERNEL_RCSID(0, "$NetBSD: nextdma.c,v 1.51 2023/02/03 23:06:42 tsutsui Exp $")
 #include <sys/syslog.h>
 #include <sys/socket.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 
diff --git a/sys/arch/next68k/next68k/machdep.c b/sys/arch/next68k/next68k/machdep.c
index 1419e31264e6..11f59c8066bc 100644
--- a/sys/arch/next68k/next68k/machdep.c
+++ b/sys/arch/next68k/next68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.120 2023/02/04 14:38:09 tsutsui Exp $	*/
+/*	$NetBSD: machdep.c,v 1.121 2023/12/20 00:40:44 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1998 Darrin B. Jewell
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.120 2023/02/04 14:38:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.121 2023/12/20 00:40:44 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -56,7 +56,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.120 2023/02/04 14:38:09 tsutsui Exp $"
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/msgbuf.h>
 #include <sys/ioctl.h>
diff --git a/sys/arch/x68k/dev/grf.c b/sys/arch/x68k/dev/grf.c
index 09eb7cf394e4..f057060ccc59 100644
--- a/sys/arch/x68k/dev/grf.c
+++ b/sys/arch/x68k/dev/grf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf.c,v 1.46 2022/05/26 14:33:29 tsutsui Exp $	*/
+/*	$NetBSD: grf.c,v 1.47 2023/12/20 00:40:44 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.46 2022/05/26 14:33:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.47 2023/12/20 00:40:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -53,7 +53,6 @@ __KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.46 2022/05/26 14:33:29 tsutsui Exp $");
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
 #include <sys/ioctl.h>
-#include <sys/malloc.h>
 #include <sys/conf.h>
 
 #include <machine/cpu.h>
diff --git a/sys/arch/x68k/dev/mfp.c b/sys/arch/x68k/dev/mfp.c
index e7b47e10677e..fa04285b7612 100644
--- a/sys/arch/x68k/dev/mfp.c
+++ b/sys/arch/x68k/dev/mfp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mfp.c,v 1.29 2021/08/07 16:19:07 thorpej Exp $	*/
+/*	$NetBSD: mfp.c,v 1.30 2023/12/20 00:40:44 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 NetBSD Foundation, Inc.
@@ -36,12 +36,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfp.c,v 1.29 2021/08/07 16:19:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfp.c,v 1.30 2023/12/20 00:40:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
diff --git a/sys/arch/x68k/dev/rtclock.c b/sys/arch/x68k/dev/rtclock.c
index 38735457ed02..24c7fa3faec6 100644
--- a/sys/arch/x68k/dev/rtclock.c
+++ b/sys/arch/x68k/dev/rtclock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtclock.c,v 1.24 2014/03/26 08:17:59 christos Exp $	*/
+/*	$NetBSD: rtclock.c,v 1.25 2023/12/20 00:40:44 thorpej Exp $	*/
 
 /*
  * Copyright 1993, 1994 Masaru Oki
@@ -36,12 +36,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtclock.c,v 1.24 2014/03/26 08:17:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtclock.c,v 1.25 2023/12/20 00:40:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
-#include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/file.h>
diff --git a/sys/arch/x68k/x68k/clock.c b/sys/arch/x68k/x68k/clock.c
index 17ac63022822..d57ffe2a102e 100644
--- a/sys/arch/x68k/x68k/clock.c
+++ b/sys/arch/x68k/x68k/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.34 2012/05/22 04:03:03 isaki Exp $	*/
+/*	$NetBSD: clock.c,v 1.35 2023/12/20 00:40:44 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.34 2012/05/22 04:03:03 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.35 2023/12/20 00:40:44 thorpej Exp $");
 
 #include "clock.h"
 
@@ -221,7 +221,6 @@ DELAY(int mic)
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
 #include <sys/ioctl.h>
-#include <sys/malloc.h>
 #include <uvm/uvm_extern.h>	/* XXX needed? */
 #include <x68k/x68k/clockioctl.h>
 #include <sys/specdev.h>
diff --git a/sys/arch/x68k/x68k/machdep.c b/sys/arch/x68k/x68k/machdep.c
index 61eecdc4f929..631ac0bd7eee 100644
--- a/sys/arch/x68k/x68k/machdep.c
+++ b/sys/arch/x68k/x68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.210 2023/03/28 20:01:57 andvar Exp $	*/
+/*	$NetBSD: machdep.c,v 1.211 2023/12/20 00:40:44 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.210 2023/03/28 20:01:57 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.211 2023/12/20 00:40:44 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -62,7 +62,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.210 2023/03/28 20:01:57 andvar Exp $")
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/file.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/msgbuf.h>
 #include <sys/ioctl.h>