Module Name: src
Committed By: thorpej
Date: Wed Dec 20 15:29:08 UTC 2023
Modified Files:
src/sys/arch/macppc/dev: deq.c esp.c gpio.c kauai.c mesh.c ofb.c
smuiic.c smusat.c snapper.c videopll.c
src/sys/arch/macppc/macppc: interrupts.c ipi_hammerhead.c
src/sys/arch/mipsco/mipsco: bus_space.c interrupt.c
src/sys/arch/mipsco/obio: asc.c
src/sys/arch/mvme68k/dev: sbicvar.h
src/sys/arch/mvmeppc/mvmeppc: machdep.c
src/sys/arch/netwinder/netwinder: autoconf.c
src/sys/arch/newsmips/dev: sc_wrap.c
src/sys/arch/newsmips/newsmips: machdep.c
src/sys/arch/playstation2/dev: wdc_spd.c
src/sys/arch/playstation2/playstation2: interrupt.c
src/sys/arch/powerpc/ibm4xx/dev: plb.c
src/sys/arch/powerpc/ibm4xx/pci: pchb.c
src/sys/arch/powerpc/powerpc: sig_machdep.c
src/sys/arch/prep/pnpbus: mcclock_pnpbus.c wdc_pnpbus.c
src/sys/arch/prep/prep: autoconf.c machdep.c platform.c
src/sys/arch/rs6000/rs6000: autoconf.c machdep.c mainbus.c
src/sys/arch/sandpoint/pci: pci_machdep.c
src/sys/arch/sandpoint/sandpoint: machdep.c mainbus.c
src/sys/arch/sandpoint/stand/altboot: brdsetup.c
src/sys/arch/sbmips/sbmips: machdep.c
src/sys/arch/sgimips/dev: crmfb.c scn.c
src/sys/arch/sgimips/gio: pci_gio.c
src/sys/arch/sgimips/hpc: if_sq.c
src/sys/arch/sgimips/ioc: ioc.c
src/sys/arch/sgimips/mace: if_mec.c mace.c pci_mace.c
src/sys/arch/sgimips/sgimips: bus.c machdep.c
Log Message:
Remove unnecessary <sys/malloc.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/macppc/dev/deq.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/macppc/dev/esp.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/macppc/dev/gpio.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/macppc/dev/kauai.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/macppc/dev/mesh.c
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/macppc/dev/ofb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/macppc/dev/smuiic.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/macppc/dev/smusat.c
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/macppc/dev/snapper.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/macppc/dev/videopll.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/macppc/macppc/interrupts.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/macppc/macppc/ipi_hammerhead.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mipsco/mipsco/bus_space.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mipsco/mipsco/interrupt.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/mipsco/obio/asc.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/mvme68k/dev/sbicvar.h
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/mvmeppc/mvmeppc/machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/netwinder/netwinder/autoconf.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/newsmips/dev/sc_wrap.c
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/newsmips/newsmips/machdep.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/playstation2/dev/wdc_spd.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/playstation2/playstation2/interrupt.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/ibm4xx/dev/plb.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/ibm4xx/pci/pchb.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/powerpc/powerpc/sig_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/prep/pnpbus/mcclock_pnpbus.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/prep/pnpbus/wdc_pnpbus.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/prep/prep/autoconf.c
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/prep/prep/machdep.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/prep/prep/platform.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/rs6000/rs6000/autoconf.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/rs6000/rs6000/machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/rs6000/rs6000/mainbus.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/sandpoint/pci/pci_machdep.c
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/sandpoint/sandpoint/machdep.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sandpoint/sandpoint/mainbus.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sandpoint/stand/altboot/brdsetup.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sbmips/sbmips/machdep.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/sgimips/dev/crmfb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sgimips/dev/scn.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sgimips/gio/pci_gio.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sgimips/hpc/if_sq.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sgimips/ioc/ioc.c
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/sgimips/mace/if_mec.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sgimips/mace/mace.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sgimips/mace/pci_mace.c
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/sgimips/sgimips/bus.c
cvs rdiff -u -r1.152 -r1.153 src/sys/arch/sgimips/sgimips/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/dev/deq.c
diff -u src/sys/arch/macppc/dev/deq.c:1.20 src/sys/arch/macppc/dev/deq.c:1.21
--- src/sys/arch/macppc/dev/deq.c:1.20 Wed Jan 27 02:17:27 2021
+++ src/sys/arch/macppc/dev/deq.c Wed Dec 20 15:29:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: deq.c,v 1.20 2021/01/27 02:17:27 thorpej Exp $ */
+/* $NetBSD: deq.c,v 1.21 2023/12/20 15:29:04 thorpej Exp $ */
/*-
* Copyright (C) 2005 Michael Lorenz
@@ -32,13 +32,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: deq.c,v 1.20 2021/01/27 02:17:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: deq.c,v 1.21 2023/12/20 15:29:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <dev/ofw/openfirm.h>
#include <dev/i2c/i2cvar.h>
Index: src/sys/arch/macppc/dev/esp.c
diff -u src/sys/arch/macppc/dev/esp.c:1.33 src/sys/arch/macppc/dev/esp.c:1.34
--- src/sys/arch/macppc/dev/esp.c:1.33 Fri Mar 5 07:15:53 2021
+++ src/sys/arch/macppc/dev/esp.c Wed Dec 20 15:29:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: esp.c,v 1.33 2021/03/05 07:15:53 rin Exp $ */
+/* $NetBSD: esp.c,v 1.34 2023/12/20 15:29:04 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.33 2021/03/05 07:15:53 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.34 2023/12/20 15:29:04 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -82,7 +82,6 @@ __KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.33
#include <sys/buf.h>
#include <sys/proc.h>
#include <sys/queue.h>
-#include <sys/malloc.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
Index: src/sys/arch/macppc/dev/gpio.c
diff -u src/sys/arch/macppc/dev/gpio.c:1.16 src/sys/arch/macppc/dev/gpio.c:1.17
--- src/sys/arch/macppc/dev/gpio.c:1.16 Sat Jan 22 11:49:16 2022
+++ src/sys/arch/macppc/dev/gpio.c Wed Dec 20 15:29:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.16 2022/01/22 11:49:16 thorpej Exp $ */
+/* $NetBSD: gpio.c,v 1.17 2023/12/20 15:29:04 thorpej Exp $ */
/*-
* Copyright (C) 1998 Internet Research Institute, Inc.
@@ -32,14 +32,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.16 2022/01/22 11:49:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.17 2023/12/20 15:29:04 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <machine/autoconf.h>
#include <machine/pio.h>
Index: src/sys/arch/macppc/dev/kauai.c
diff -u src/sys/arch/macppc/dev/kauai.c:1.41 src/sys/arch/macppc/dev/kauai.c:1.42
--- src/sys/arch/macppc/dev/kauai.c:1.41 Fri Mar 5 07:15:53 2021
+++ src/sys/arch/macppc/dev/kauai.c Wed Dec 20 15:29:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kauai.c,v 1.41 2021/03/05 07:15:53 rin Exp $ */
+/* $NetBSD: kauai.c,v 1.42 2023/12/20 15:29:04 thorpej Exp $ */
/*-
* Copyright (c) 2003 Tsubai Masanari. All rights reserved.
@@ -27,12 +27,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.41 2021/03/05 07:15:53 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.42 2023/12/20 15:29:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/macppc/dev/mesh.c
diff -u src/sys/arch/macppc/dev/mesh.c:1.43 src/sys/arch/macppc/dev/mesh.c:1.44
--- src/sys/arch/macppc/dev/mesh.c:1.43 Sun Sep 24 08:20:06 2023
+++ src/sys/arch/macppc/dev/mesh.c Wed Dec 20 15:29:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mesh.c,v 1.43 2023/09/24 08:20:06 andvar Exp $ */
+/* $NetBSD: mesh.c,v 1.44 2023/12/20 15:29:04 thorpej Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari.
@@ -33,14 +33,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mesh.c,v 1.43 2023/09/24 08:20:06 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mesh.c,v 1.44 2023/12/20 15:29:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/buf.h>
#include <sys/device.h>
#include <sys/errno.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/queue.h>
#include <sys/systm.h>
Index: src/sys/arch/macppc/dev/ofb.c
diff -u src/sys/arch/macppc/dev/ofb.c:1.72 src/sys/arch/macppc/dev/ofb.c:1.73
--- src/sys/arch/macppc/dev/ofb.c:1.72 Sat Aug 7 16:18:57 2021
+++ src/sys/arch/macppc/dev/ofb.c Wed Dec 20 15:29:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ofb.c,v 1.72 2021/08/07 16:18:57 thorpej Exp $ */
+/* $NetBSD: ofb.c,v 1.73 2023/12/20 15:29:04 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.72 2021/08/07 16:18:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.73 2023/12/20 15:29:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -36,7 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.72
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/systm.h>
#include <sys/kauth.h>
#include <sys/lwp.h>
Index: src/sys/arch/macppc/dev/smuiic.c
diff -u src/sys/arch/macppc/dev/smuiic.c:1.10 src/sys/arch/macppc/dev/smuiic.c:1.11
--- src/sys/arch/macppc/dev/smuiic.c:1.10 Mon Aug 9 04:07:29 2021
+++ src/sys/arch/macppc/dev/smuiic.c Wed Dec 20 15:29:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: smuiic.c,v 1.10 2021/08/09 04:07:29 thorpej Exp $ */
+/* $NetBSD: smuiic.c,v 1.11 2023/12/20 15:29:04 thorpej Exp $ */
/*-
* Copyright (c) 2013 Phileas Fogg
@@ -29,7 +29,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/proc.h>
#include <sys/mutex.h>
Index: src/sys/arch/macppc/dev/smusat.c
diff -u src/sys/arch/macppc/dev/smusat.c:1.9 src/sys/arch/macppc/dev/smusat.c:1.10
--- src/sys/arch/macppc/dev/smusat.c:1.9 Wed Jan 27 02:17:28 2021
+++ src/sys/arch/macppc/dev/smusat.c Wed Dec 20 15:29:04 2023
@@ -27,7 +27,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/proc.h>
#include <sys/mutex.h>
Index: src/sys/arch/macppc/dev/snapper.c
diff -u src/sys/arch/macppc/dev/snapper.c:1.66 src/sys/arch/macppc/dev/snapper.c:1.67
--- src/sys/arch/macppc/dev/snapper.c:1.66 Mon Dec 11 13:06:06 2023
+++ src/sys/arch/macppc/dev/snapper.c Wed Dec 20 15:29:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: snapper.c,v 1.66 2023/12/11 13:06:06 mlelstv Exp $ */
+/* $NetBSD: snapper.c,v 1.67 2023/12/20 15:29:04 thorpej Exp $ */
/* Id: snapper.c,v 1.11 2002/10/31 17:42:13 tsubai Exp */
/* Id: i2s.c,v 1.12 2005/01/15 14:32:35 tsubai Exp */
@@ -35,13 +35,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.66 2023/12/11 13:06:06 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.67 2023/12/20 15:29:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
#include <sys/device.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <dev/audio/audio_if.h>
#include <dev/ofw/openfirm.h>
Index: src/sys/arch/macppc/dev/videopll.c
diff -u src/sys/arch/macppc/dev/videopll.c:1.3 src/sys/arch/macppc/dev/videopll.c:1.4
--- src/sys/arch/macppc/dev/videopll.c:1.3 Sat Jun 16 21:22:13 2018
+++ src/sys/arch/macppc/dev/videopll.c Wed Dec 20 15:29:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: videopll.c,v 1.3 2018/06/16 21:22:13 thorpej Exp $ */
+/* $NetBSD: videopll.c,v 1.4 2023/12/20 15:29:04 thorpej Exp $ */
/*
* Copyright (c) 2012 Michael Lorenz
@@ -33,13 +33,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: videopll.c,v 1.3 2018/06/16 21:22:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: videopll.c,v 1.4 2023/12/20 15:29:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <dev/ofw/openfirm.h>
#include <dev/i2c/i2cvar.h>
Index: src/sys/arch/macppc/macppc/interrupts.c
diff -u src/sys/arch/macppc/macppc/interrupts.c:1.9 src/sys/arch/macppc/macppc/interrupts.c:1.10
--- src/sys/arch/macppc/macppc/interrupts.c:1.9 Wed Dec 28 06:00:26 2022
+++ src/sys/arch/macppc/macppc/interrupts.c Wed Dec 20 15:29:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupts.c,v 1.9 2022/12/28 06:00:26 macallan Exp $ */
+/* $NetBSD: interrupts.c,v 1.10 2023/12/20 15:29:05 thorpej Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,12 +27,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupts.c,v 1.9 2022/12/28 06:00:26 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupts.c,v 1.10 2023/12/20 15:29:05 thorpej Exp $");
#include "opt_multiprocessor.h"
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <prop/proplib.h>
Index: src/sys/arch/macppc/macppc/ipi_hammerhead.c
diff -u src/sys/arch/macppc/macppc/ipi_hammerhead.c:1.6 src/sys/arch/macppc/macppc/ipi_hammerhead.c:1.7
--- src/sys/arch/macppc/macppc/ipi_hammerhead.c:1.6 Fri Mar 5 07:15:53 2021
+++ src/sys/arch/macppc/macppc/ipi_hammerhead.c Wed Dec 20 15:29:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ipi_hammerhead.c,v 1.6 2021/03/05 07:15:53 rin Exp $ */
+/* $NetBSD: ipi_hammerhead.c,v 1.7 2023/12/20 15:29:05 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,11 +29,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipi_hammerhead.c,v 1.6 2021/03/05 07:15:53 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipi_hammerhead.c,v 1.7 2023/12/20 15:29:05 thorpej Exp $");
#include "opt_multiprocessor.h"
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/atomic.h>
Index: src/sys/arch/mipsco/mipsco/bus_space.c
diff -u src/sys/arch/mipsco/mipsco/bus_space.c:1.13 src/sys/arch/mipsco/mipsco/bus_space.c:1.14
--- src/sys/arch/mipsco/mipsco/bus_space.c:1.13 Fri Dec 8 01:38:20 2023
+++ src/sys/arch/mipsco/mipsco/bus_space.c Wed Dec 20 15:29:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.13 2023/12/08 01:38:20 thorpej Exp $ */
+/* $NetBSD: bus_space.c,v 1.14 2023/12/20 15:29:05 thorpej Exp $ */
/*
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,11 +31,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.13 2023/12/08 01:38:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.14 2023/12/20 15:29:05 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/mipsco/mipsco/interrupt.c
diff -u src/sys/arch/mipsco/mipsco/interrupt.c:1.11 src/sys/arch/mipsco/mipsco/interrupt.c:1.12
--- src/sys/arch/mipsco/mipsco/interrupt.c:1.11 Sun Feb 20 07:56:16 2011
+++ src/sys/arch/mipsco/mipsco/interrupt.c Wed Dec 20 15:29:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.11 2011/02/20 07:56:16 matt Exp $ */
+/* $NetBSD: interrupt.c,v 1.12 2023/12/20 15:29:05 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,10 +31,9 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.11 2011/02/20 07:56:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.12 2023/12/20 15:29:05 thorpej Exp $");
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/intr.h>
#include <sys/lwp.h>
#include <sys/cpu.h>
Index: src/sys/arch/mipsco/obio/asc.c
diff -u src/sys/arch/mipsco/obio/asc.c:1.23 src/sys/arch/mipsco/obio/asc.c:1.24
--- src/sys/arch/mipsco/obio/asc.c:1.23 Tue May 3 20:52:31 2022
+++ src/sys/arch/mipsco/obio/asc.c Wed Dec 20 15:29:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: asc.c,v 1.23 2022/05/03 20:52:31 andvar Exp $ */
+/* $NetBSD: asc.c,v 1.24 2023/12/20 15:29:05 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.23 2022/05/03 20:52:31 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.24 2023/12/20 15:29:05 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.23
#include <sys/errno.h>
#include <sys/device.h>
#include <sys/buf.h>
-#include <sys/malloc.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/mvme68k/dev/sbicvar.h
diff -u src/sys/arch/mvme68k/dev/sbicvar.h:1.17 src/sys/arch/mvme68k/dev/sbicvar.h:1.18
--- src/sys/arch/mvme68k/dev/sbicvar.h:1.17 Sat Jan 1 21:07:14 2022
+++ src/sys/arch/mvme68k/dev/sbicvar.h Wed Dec 20 15:29:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sbicvar.h,v 1.17 2022/01/01 21:07:14 andvar Exp $ */
+/* $NetBSD: sbicvar.h,v 1.18 2023/12/20 15:29:05 thorpej Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -35,8 +35,8 @@
*/
#ifndef _SBICVAR_H_
#define _SBICVAR_H_
+
#include <sys/callout.h>
-#include <sys/malloc.h>
/*
Index: src/sys/arch/mvmeppc/mvmeppc/machdep.c
diff -u src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.33 src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.34
--- src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.33 Tue Mar 28 20:01:57 2023
+++ src/sys/arch/mvmeppc/mvmeppc/machdep.c Wed Dec 20 15:29:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.33 2023/03/28 20:01:57 andvar Exp $ */
+/* $NetBSD: machdep.c,v 1.34 2023/12/20 15:29:05 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.33 2023/03/28 20:01:57 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.34 2023/12/20 15:29:05 thorpej Exp $");
#include "opt_compat_netbsd.h"
#include "opt_mvmetype.h"
@@ -47,7 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <sys/extent.h>
#include <sys/intr.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/mount.h>
#include <sys/msgbuf.h>
Index: src/sys/arch/netwinder/netwinder/autoconf.c
diff -u src/sys/arch/netwinder/netwinder/autoconf.c:1.12 src/sys/arch/netwinder/netwinder/autoconf.c:1.13
--- src/sys/arch/netwinder/netwinder/autoconf.c:1.12 Sat Oct 27 17:18:04 2012
+++ src/sys/arch/netwinder/netwinder/autoconf.c Wed Dec 20 15:29:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.12 2012/10/27 17:18:04 chs Exp $ */
+/* $NetBSD: autoconf.c,v 1.13 2023/12/20 15:29:05 thorpej Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.12 2012/10/27 17:18:04 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.13 2023/12/20 15:29:05 thorpej Exp $");
#include "opt_md.h"
@@ -54,7 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
#include <sys/device.h>
#include <sys/conf.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <machine/bootconfig.h>
#include <machine/intr.h>
Index: src/sys/arch/newsmips/dev/sc_wrap.c
diff -u src/sys/arch/newsmips/dev/sc_wrap.c:1.33 src/sys/arch/newsmips/dev/sc_wrap.c:1.34
--- src/sys/arch/newsmips/dev/sc_wrap.c:1.33 Sat Aug 7 16:19:01 2021
+++ src/sys/arch/newsmips/dev/sc_wrap.c Wed Dec 20 15:29:05 2023
@@ -1,11 +1,11 @@
-/* $NetBSD: sc_wrap.c,v 1.33 2021/08/07 16:19:01 thorpej Exp $ */
+/* $NetBSD: sc_wrap.c,v 1.34 2023/12/20 15:29:05 thorpej Exp $ */
/*
* This driver is slow! Need to rewrite.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sc_wrap.c,v 1.33 2021/08/07 16:19:01 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sc_wrap.c,v 1.34 2023/12/20 15:29:05 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -14,7 +14,6 @@ __KERNEL_RCSID(0, "$NetBSD: sc_wrap.c,v
#include <sys/device.h>
#include <sys/proc.h>
#include <sys/buf.h>
-#include <sys/malloc.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/newsmips/newsmips/machdep.c
diff -u src/sys/arch/newsmips/newsmips/machdep.c:1.121 src/sys/arch/newsmips/newsmips/machdep.c:1.122
--- src/sys/arch/newsmips/newsmips/machdep.c:1.121 Fri Oct 19 13:40:33 2018
+++ src/sys/arch/newsmips/newsmips/machdep.c Wed Dec 20 15:29:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.121 2018/10/19 13:40:33 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.122 2023/12/20 15:29:05 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.121 2018/10/19 13:40:33 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.122 2023/12/20 15:29:05 thorpej Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -58,7 +58,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#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>
Index: src/sys/arch/playstation2/dev/wdc_spd.c
diff -u src/sys/arch/playstation2/dev/wdc_spd.c:1.29 src/sys/arch/playstation2/dev/wdc_spd.c:1.30
--- src/sys/arch/playstation2/dev/wdc_spd.c:1.29 Fri Oct 20 07:06:07 2017
+++ src/sys/arch/playstation2/dev/wdc_spd.c Wed Dec 20 15:29:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_spd.c,v 1.29 2017/10/20 07:06:07 jdolecek Exp $ */
+/* $NetBSD: wdc_spd.c,v 1.30 2023/12/20 15:29:05 thorpej Exp $ */
/*-
* Copyright (c) 2001, 2003 The NetBSD Foundation, Inc.
@@ -30,11 +30,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_spd.c,v 1.29 2017/10/20 07:06:07 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_spd.c,v 1.30 2023/12/20 15:29:05 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#define __read_1(a) \
({ \
Index: src/sys/arch/playstation2/playstation2/interrupt.c
diff -u src/sys/arch/playstation2/playstation2/interrupt.c:1.19 src/sys/arch/playstation2/playstation2/interrupt.c:1.20
--- src/sys/arch/playstation2/playstation2/interrupt.c:1.19 Sun Nov 5 22:05:07 2023
+++ src/sys/arch/playstation2/playstation2/interrupt.c Wed Dec 20 15:29:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.19 2023/11/05 22:05:07 andvar Exp $ */
+/* $NetBSD: interrupt.c,v 1.20 2023/12/20 15:29:06 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.19 2023/11/05 22:05:07 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.20 2023/12/20 15:29:06 thorpej Exp $");
#include "debug_playstation2.h"
#if defined INTR_DEBUG && !defined GSFB_DEBUG_MONITOR
@@ -35,7 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: interrupt.c,
#endif
#include <sys/param.h>
-#include <sys/malloc.h>
#include <uvm/uvm_extern.h> /* uvmexp.intrs */
Index: src/sys/arch/powerpc/ibm4xx/dev/plb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.24 src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.25
--- src/sys/arch/powerpc/ibm4xx/dev/plb.c:1.24 Sat Aug 7 16:19:03 2021
+++ src/sys/arch/powerpc/ibm4xx/dev/plb.c Wed Dec 20 15:29:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: plb.c,v 1.24 2021/08/07 16:19:03 thorpej Exp $ */
+/* $NetBSD: plb.c,v 1.25 2023/12/20 15:29:06 thorpej Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plb.c,v 1.24 2021/08/07 16:19:03 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plb.c,v 1.25 2023/12/20 15:29:06 thorpej Exp $");
#include "emac.h"
#include "locators.h"
@@ -77,7 +77,6 @@ __KERNEL_RCSID(0, "$NetBSD: plb.c,v 1.24
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/extent.h>
-#include <sys/malloc.h>
#include <sys/bus.h>
#include <sys/cpu.h>
Index: src/sys/arch/powerpc/ibm4xx/pci/pchb.c
diff -u src/sys/arch/powerpc/ibm4xx/pci/pchb.c:1.16 src/sys/arch/powerpc/ibm4xx/pci/pchb.c:1.17
--- src/sys/arch/powerpc/ibm4xx/pci/pchb.c:1.16 Sat Aug 7 16:19:03 2021
+++ src/sys/arch/powerpc/ibm4xx/pci/pchb.c Wed Dec 20 15:29:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pchb.c,v 1.16 2021/08/07 16:19:03 thorpej Exp $ */
+/* $NetBSD: pchb.c,v 1.17 2023/12/20 15:29:06 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.16 2021/08/07 16:19:03 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.17 2023/12/20 15:29:06 thorpej Exp $");
#include "pci.h"
@@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.1
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#define _IBM4XX_BUS_DMA_PRIVATE
Index: src/sys/arch/powerpc/powerpc/sig_machdep.c
diff -u src/sys/arch/powerpc/powerpc/sig_machdep.c:1.54 src/sys/arch/powerpc/powerpc/sig_machdep.c:1.55
--- src/sys/arch/powerpc/powerpc/sig_machdep.c:1.54 Mon Nov 1 05:07:15 2021
+++ src/sys/arch/powerpc/powerpc/sig_machdep.c Wed Dec 20 15:29:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.54 2021/11/01 05:07:15 thorpej Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.55 2023/12/20 15:29:06 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.54 2021/11/01 05:07:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.55 2023/12/20 15:29:06 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_altivec.h"
@@ -54,6 +54,10 @@ __KERNEL_RCSID(0, "$NetBSD: sig_machdep.
#include <powerpc/pcb.h>
#include <powerpc/psl.h>
+/* Assert that the sizes of these two structures are multiples of 16. */
+CTASSERT((sizeof(siginfo_t) & (CALLFRAMELEN-1)) == 0);
+CTASSERT((sizeof(ucontext_t) & (CALLFRAMELEN-1)) == 0);
+
/*
* Send a signal to process.
*/
@@ -78,17 +82,33 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
/* Find top of stack. */
sp = (onstack ? (vaddr_t)ss->ss_sp + ss->ss_size : tf->tf_fixreg[1]);
+
+ /* Ensure it is aligned. */
sp &= ~(CALLFRAMELEN-1);
/* Allocate space for the ucontext. */
sp -= sizeof(ucontext_t);
- ucp = sp;
/* Allocate space for the siginfo. */
sp -= sizeof(siginfo_t);
- sip = sp;
+#if 0 /* Not needed; see CTASSERTs above. */
+ /* Align it again. */
sp &= ~(CALLFRAMELEN-1);
+#endif
+
+ sip = sp;
+ ucp = sp + sizeof(siginfo_t);
+
+ KASSERT((sip & (CALLFRAMELEN-1)) == 0);
+ KASSERT((ucp & (CALLFRAMELEN-1)) == 0);
+
+ /*
+ * Now allocate space for a call frame, so that there's
+ * space for the ABI-mandated stack linkage area in the
+ * event the signal handler calls a another function.
+ */
+ sp -= CALLFRAMELEN;
/* Save register context. */
memset(&uc, 0, sizeof(uc));
@@ -123,7 +143,7 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
*/
switch (sd->sd_vers) {
case __SIGTRAMP_SIGINFO_VERSION: /* siginfo sigtramp */
- tf->tf_fixreg[1] = (register_t)sp - CALLFRAMELEN;
+ tf->tf_fixreg[1] = (register_t)sp;
tf->tf_fixreg[3] = (register_t)ksi->ksi_signo;
tf->tf_fixreg[4] = (register_t)sip;
tf->tf_fixreg[5] = (register_t)ucp;
Index: src/sys/arch/prep/pnpbus/mcclock_pnpbus.c
diff -u src/sys/arch/prep/pnpbus/mcclock_pnpbus.c:1.10 src/sys/arch/prep/pnpbus/mcclock_pnpbus.c:1.11
--- src/sys/arch/prep/pnpbus/mcclock_pnpbus.c:1.10 Fri Jul 1 16:55:42 2011
+++ src/sys/arch/prep/pnpbus/mcclock_pnpbus.c Wed Dec 20 15:29:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_pnpbus.c,v 1.10 2011/07/01 16:55:42 dyoung Exp $ */
+/* $NetBSD: mcclock_pnpbus.c,v 1.11 2023/12/20 15:29:06 thorpej Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -39,13 +39,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcclock_pnpbus.c,v 1.10 2011/07/01 16:55:42 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_pnpbus.c,v 1.11 2023/12/20 15:29:06 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/bus.h>
#include <machine/intr.h>
Index: src/sys/arch/prep/pnpbus/wdc_pnpbus.c
diff -u src/sys/arch/prep/pnpbus/wdc_pnpbus.c:1.15 src/sys/arch/prep/pnpbus/wdc_pnpbus.c:1.16
--- src/sys/arch/prep/pnpbus/wdc_pnpbus.c:1.15 Fri Oct 20 07:06:07 2017
+++ src/sys/arch/prep/pnpbus/wdc_pnpbus.c Wed Dec 20 15:29:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_pnpbus.c,v 1.15 2017/10/20 07:06:07 jdolecek Exp $ */
+/* $NetBSD: wdc_pnpbus.c,v 1.16 2023/12/20 15:29:06 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -30,13 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_pnpbus.c,v 1.15 2017/10/20 07:06:07 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_pnpbus.c,v 1.16 2023/12/20 15:29:06 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/bus.h>
#include <machine/intr.h>
Index: src/sys/arch/prep/prep/autoconf.c
diff -u src/sys/arch/prep/prep/autoconf.c:1.29 src/sys/arch/prep/prep/autoconf.c:1.30
--- src/sys/arch/prep/prep/autoconf.c:1.29 Sun May 22 11:27:34 2022
+++ src/sys/arch/prep/prep/autoconf.c Wed Dec 20 15:29:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.29 2022/05/22 11:27:34 andvar Exp $ */
+/* $NetBSD: autoconf.c,v 1.30 2023/12/20 15:29:06 thorpej Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.29 2022/05/22 11:27:34 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.30 2023/12/20 15:29:06 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
#include <sys/conf.h>
#include <sys/reboot.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/queue.h>
#include <machine/pte.h>
Index: src/sys/arch/prep/prep/machdep.c
diff -u src/sys/arch/prep/prep/machdep.c:1.77 src/sys/arch/prep/prep/machdep.c:1.78
--- src/sys/arch/prep/prep/machdep.c:1.77 Sat Feb 27 01:31:24 2021
+++ src/sys/arch/prep/prep/machdep.c Wed Dec 20 15:29:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.77 2021/02/27 01:31:24 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.78 2023/12/20 15:29:06 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.77 2021/02/27 01:31:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.78 2023/12/20 15:29:06 thorpej Exp $");
#include "opt_compat_netbsd.h"
#include "opt_openpic.h"
@@ -46,7 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <sys/extent.h>
#include <sys/intr.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/mount.h>
#include <sys/msgbuf.h>
Index: src/sys/arch/prep/prep/platform.c
diff -u src/sys/arch/prep/prep/platform.c:1.28 src/sys/arch/prep/prep/platform.c:1.29
--- src/sys/arch/prep/prep/platform.c:1.28 Thu Apr 3 23:49:47 2014
+++ src/sys/arch/prep/prep/platform.c Wed Dec 20 15:29:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: platform.c,v 1.28 2014/04/03 23:49:47 mrg Exp $ */
+/* $NetBSD: platform.c,v 1.29 2023/12/20 15:29:06 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,11 +30,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: platform.c,v 1.28 2014/04/03 23:49:47 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: platform.c,v 1.29 2023/12/20 15:29:06 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/intr.h>
#include <sys/inttypes.h>
Index: src/sys/arch/rs6000/rs6000/autoconf.c
diff -u src/sys/arch/rs6000/rs6000/autoconf.c:1.4 src/sys/arch/rs6000/rs6000/autoconf.c:1.5
--- src/sys/arch/rs6000/rs6000/autoconf.c:1.4 Sun Jul 29 18:05:47 2012
+++ src/sys/arch/rs6000/rs6000/autoconf.c Wed Dec 20 15:29:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.4 2012/07/29 18:05:47 mlelstv Exp $ */
+/* $NetBSD: autoconf.c,v 1.5 2023/12/20 15:29:06 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.4 2012/07/29 18:05:47 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5 2023/12/20 15:29:06 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
#include <sys/conf.h>
#include <sys/reboot.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/queue.h>
#include <machine/pte.h>
Index: src/sys/arch/rs6000/rs6000/machdep.c
diff -u src/sys/arch/rs6000/rs6000/machdep.c:1.12 src/sys/arch/rs6000/rs6000/machdep.c:1.13
--- src/sys/arch/rs6000/rs6000/machdep.c:1.12 Wed Dec 8 20:50:02 2021
+++ src/sys/arch/rs6000/rs6000/machdep.c Wed Dec 20 15:29:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.12 2021/12/08 20:50:02 andvar Exp $ */
+/* $NetBSD: machdep.c,v 1.13 2023/12/20 15:29:06 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.12 2021/12/08 20:50:02 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.13 2023/12/20 15:29:06 thorpej Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -46,7 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <sys/intr.h>
#include <sys/kernel.h>
#include <sys/ksyms.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/mount.h>
#include <sys/msgbuf.h>
Index: src/sys/arch/rs6000/rs6000/mainbus.c
diff -u src/sys/arch/rs6000/rs6000/mainbus.c:1.7 src/sys/arch/rs6000/rs6000/mainbus.c:1.8
--- src/sys/arch/rs6000/rs6000/mainbus.c:1.7 Sat Aug 7 16:19:04 2021
+++ src/sys/arch/rs6000/rs6000/mainbus.c Wed Dec 20 15:29:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.7 2021/08/07 16:19:04 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.8 2023/12/20 15:29:06 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,13 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.7 2021/08/07 16:19:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.8 2023/12/20 15:29:06 thorpej Exp $");
#include <sys/param.h>
#include <sys/extent.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/bus.h>
#include <machine/autoconf.h>
Index: src/sys/arch/sandpoint/pci/pci_machdep.c
diff -u src/sys/arch/sandpoint/pci/pci_machdep.c:1.37 src/sys/arch/sandpoint/pci/pci_machdep.c:1.38
--- src/sys/arch/sandpoint/pci/pci_machdep.c:1.37 Thu Jun 1 02:45:07 2017
+++ src/sys/arch/sandpoint/pci/pci_machdep.c Wed Dec 20 15:29:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.37 2017/06/01 02:45:07 chs Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.38 2023/12/20 15:29:06 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.37 2017/06/01 02:45:07 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.38 2023/12/20 15:29:06 thorpej Exp $");
#include "opt_pci.h"
@@ -53,7 +53,6 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
#include <sys/errno.h>
#include <sys/extent.h>
#include <sys/kmem.h>
-#include <sys/malloc.h>
#include <sys/queue.h>
#include <sys/systm.h>
#include <sys/time.h>
Index: src/sys/arch/sandpoint/sandpoint/machdep.c
diff -u src/sys/arch/sandpoint/sandpoint/machdep.c:1.68 src/sys/arch/sandpoint/sandpoint/machdep.c:1.69
--- src/sys/arch/sandpoint/sandpoint/machdep.c:1.68 Wed Mar 17 14:50:11 2021
+++ src/sys/arch/sandpoint/sandpoint/machdep.c Wed Dec 20 15:29:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.68 2021/03/17 14:50:11 rin Exp $ */
+/* $NetBSD: machdep.c,v 1.69 2023/12/20 15:29:07 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.68 2021/03/17 14:50:11 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.69 2023/12/20 15:29:07 thorpej Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -49,7 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <sys/intr.h>
#include <sys/kernel.h>
#include <sys/ksyms.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/module.h>
#include <sys/mount.h>
Index: src/sys/arch/sandpoint/sandpoint/mainbus.c
diff -u src/sys/arch/sandpoint/sandpoint/mainbus.c:1.34 src/sys/arch/sandpoint/sandpoint/mainbus.c:1.35
--- src/sys/arch/sandpoint/sandpoint/mainbus.c:1.34 Sat Aug 7 16:19:04 2021
+++ src/sys/arch/sandpoint/sandpoint/mainbus.c Wed Dec 20 15:29:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.34 2021/08/07 16:19:04 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.35 2023/12/20 15:29:07 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,14 +31,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.34 2021/08/07 16:19:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.35 2023/12/20 15:29:07 thorpej Exp $");
#include "opt_pci.h"
#include "pci.h"
#include <sys/param.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/systm.h>
#include <machine/autoconf.h>
Index: src/sys/arch/sandpoint/stand/altboot/brdsetup.c
diff -u src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.41 src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.42
--- src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.41 Wed Feb 16 23:49:27 2022
+++ src/sys/arch/sandpoint/stand/altboot/brdsetup.c Wed Dec 20 15:29:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: brdsetup.c,v 1.41 2022/02/16 23:49:27 riastradh Exp $ */
+/* $NetBSD: brdsetup.c,v 1.42 2023/12/20 15:29:07 thorpej Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -715,11 +715,17 @@ kuroreset()
void
synosetup(struct brdprop *brd)
{
-
+ /*
+ * My DS107e works much better with the
+ * default EXT_CLK_FREQ (33333333).
+ * --thorpej
+ */
+#if 0
if (1) /* 200 and 266MHz models */
brd->extclk = 33164691; /* from Synology/Linux source */
else /* 400MHz models XXX how to check? */
brd->extclk = 33165343;
+#endif
}
void
Index: src/sys/arch/sbmips/sbmips/machdep.c
diff -u src/sys/arch/sbmips/sbmips/machdep.c:1.56 src/sys/arch/sbmips/sbmips/machdep.c:1.57
--- src/sys/arch/sbmips/sbmips/machdep.c:1.56 Tue Dec 5 19:19:26 2023
+++ src/sys/arch/sbmips/sbmips/machdep.c Wed Dec 20 15:29:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.56 2023/12/05 19:19:26 andvar Exp $ */
+/* $NetBSD: machdep.c,v 1.57 2023/12/20 15:29:07 thorpej Exp $ */
/*
* Copyright 2000, 2001
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.56 2023/12/05 19:19:26 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.57 2023/12/20 15:29:07 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -75,7 +75,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <sys/kcore.h>
#include <sys/kernel.h>
#include <sys/ksyms.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/mount.h>
#include <sys/msgbuf.h>
Index: src/sys/arch/sgimips/dev/crmfb.c
diff -u src/sys/arch/sgimips/dev/crmfb.c:1.49 src/sys/arch/sgimips/dev/crmfb.c:1.50
--- src/sys/arch/sgimips/dev/crmfb.c:1.49 Sat Aug 7 16:19:04 2021
+++ src/sys/arch/sgimips/dev/crmfb.c Wed Dec 20 15:29:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: crmfb.c,v 1.49 2021/08/07 16:19:04 thorpej Exp $ */
+/* $NetBSD: crmfb.c,v 1.50 2023/12/20 15:29:07 thorpej Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -32,12 +32,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: crmfb.c,v 1.49 2021/08/07 16:19:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: crmfb.c,v 1.50 2023/12/20 15:29:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <machine/autoconf.h>
#include <sys/bus.h>
Index: src/sys/arch/sgimips/dev/scn.c
diff -u src/sys/arch/sgimips/dev/scn.c:1.10 src/sys/arch/sgimips/dev/scn.c:1.11
--- src/sys/arch/sgimips/dev/scn.c:1.10 Wed Oct 26 23:59:14 2022
+++ src/sys/arch/sgimips/dev/scn.c Wed Dec 20 15:29:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: scn.c,v 1.10 2022/10/26 23:59:14 riastradh Exp $ */
+/* $NetBSD: scn.c,v 1.11 2023/12/20 15:29:07 thorpej Exp $ */
/*
* Resurrected from the old pc532 port 1/18/2009.
@@ -92,7 +92,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scn.c,v 1.10 2022/10/26 23:59:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scn.c,v 1.11 2023/12/20 15:29:07 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -110,7 +110,6 @@ __KERNEL_RCSID(0, "$NetBSD: scn.c,v 1.10
#include <sys/syslog.h>
#include <sys/types.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/conf.h>
#include <sys/intr.h>
#ifdef KGDB
Index: src/sys/arch/sgimips/gio/pci_gio.c
diff -u src/sys/arch/sgimips/gio/pci_gio.c:1.19 src/sys/arch/sgimips/gio/pci_gio.c:1.20
--- src/sys/arch/sgimips/gio/pci_gio.c:1.19 Sat Aug 7 16:19:04 2021
+++ src/sys/arch/sgimips/gio/pci_gio.c Wed Dec 20 15:29:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_gio.c,v 1.19 2021/08/07 16:19:04 thorpej Exp $ */
+/* $NetBSD: pci_gio.c,v 1.20 2023/12/20 15:29:07 thorpej Exp $ */
/*
* Copyright (c) 2006 Stephen M. Rumble
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_gio.c,v 1.19 2021/08/07 16:19:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_gio.c,v 1.20 2023/12/20 15:29:07 thorpej Exp $");
/*
* Glue for PCI devices that are connected to the GIO bus by various little
@@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: pci_gio.c,v
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/bus.h>
#include <machine/machtype.h>
Index: src/sys/arch/sgimips/hpc/if_sq.c
diff -u src/sys/arch/sgimips/hpc/if_sq.c:1.56 src/sys/arch/sgimips/hpc/if_sq.c:1.57
--- src/sys/arch/sgimips/hpc/if_sq.c:1.56 Tue Dec 5 21:54:53 2023
+++ src/sys/arch/sgimips/hpc/if_sq.c Wed Dec 20 15:29:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sq.c,v 1.56 2023/12/05 21:54:53 andvar Exp $ */
+/* $NetBSD: if_sq.c,v 1.57 2023/12/20 15:29:07 thorpej Exp $ */
/*
* Copyright (c) 2001 Rafal K. Boni
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.56 2023/12/05 21:54:53 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.57 2023/12/20 15:29:07 thorpej Exp $");
#include <sys/param.h>
@@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.
#include <sys/device.h>
#include <sys/callout.h>
#include <sys/mbuf.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
Index: src/sys/arch/sgimips/ioc/ioc.c
diff -u src/sys/arch/sgimips/ioc/ioc.c:1.13 src/sys/arch/sgimips/ioc/ioc.c:1.14
--- src/sys/arch/sgimips/ioc/ioc.c:1.13 Sat Aug 7 16:19:04 2021
+++ src/sys/arch/sgimips/ioc/ioc.c Wed Dec 20 15:29:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ioc.c,v 1.13 2021/08/07 16:19:04 thorpej Exp $ */
+/* $NetBSD: ioc.c,v 1.14 2023/12/20 15:29:07 thorpej Exp $ */
/*
* Copyright (c) 2003 Christopher Sekiya
@@ -37,13 +37,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.13 2021/08/07 16:19:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.14 2023/12/20 15:29:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/callout.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
Index: src/sys/arch/sgimips/mace/if_mec.c
diff -u src/sys/arch/sgimips/mace/if_mec.c:1.64 src/sys/arch/sgimips/mace/if_mec.c:1.65
--- src/sys/arch/sgimips/mace/if_mec.c:1.64 Sun Sep 18 13:26:40 2022
+++ src/sys/arch/sgimips/mace/if_mec.c Wed Dec 20 15:29:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mec.c,v 1.64 2022/09/18 13:26:40 thorpej Exp $ */
+/* $NetBSD: if_mec.c,v 1.65 2023/12/20 15:29:07 thorpej Exp $ */
/*-
* Copyright (c) 2004, 2008 Izumi Tsutsui. All rights reserved.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1.64 2022/09/18 13:26:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1.65 2023/12/20 15:29:07 thorpej Exp $");
#include "opt_ddb.h"
@@ -70,7 +70,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1
#include <sys/device.h>
#include <sys/callout.h>
#include <sys/mbuf.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
Index: src/sys/arch/sgimips/mace/mace.c
diff -u src/sys/arch/sgimips/mace/mace.c:1.26 src/sys/arch/sgimips/mace/mace.c:1.27
--- src/sys/arch/sgimips/mace/mace.c:1.26 Thu Aug 3 08:31:06 2023
+++ src/sys/arch/sgimips/mace/mace.c Wed Dec 20 15:29:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mace.c,v 1.26 2023/08/03 08:31:06 mrg Exp $ */
+/* $NetBSD: mace.c,v 1.27 2023/12/20 15:29:07 thorpej Exp $ */
/*
* Copyright (c) 2003 Christopher Sekiya
@@ -45,14 +45,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.26 2023/08/03 08:31:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.27 2023/12/20 15:29:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/callout.h>
#include <sys/mbuf.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
Index: src/sys/arch/sgimips/mace/pci_mace.c
diff -u src/sys/arch/sgimips/mace/pci_mace.c:1.25 src/sys/arch/sgimips/mace/pci_mace.c:1.26
--- src/sys/arch/sgimips/mace/pci_mace.c:1.25 Sat Aug 7 16:19:04 2021
+++ src/sys/arch/sgimips/mace/pci_mace.c Wed Dec 20 15:29:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_mace.c,v 1.25 2021/08/07 16:19:04 thorpej Exp $ */
+/* $NetBSD: pci_mace.c,v 1.26 2023/12/20 15:29:07 thorpej Exp $ */
/*
* Copyright (c) 2001,2003 Christopher Sekiya
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_mace.c,v 1.25 2021/08/07 16:19:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_mace.c,v 1.26 2023/12/20 15:29:07 thorpej Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -56,7 +56,6 @@ __KERNEL_RCSID(0, "$NetBSD: pci_mace.c,v
#include <dev/pci/pcireg.h>
#include <dev/pci/pcidevs.h>
-#include <sys/malloc.h>
#include <dev/pci/pciconf.h>
#include <sgimips/mace/macereg.h>
Index: src/sys/arch/sgimips/sgimips/bus.c
diff -u src/sys/arch/sgimips/sgimips/bus.c:1.69 src/sys/arch/sgimips/sgimips/bus.c:1.70
--- src/sys/arch/sgimips/sgimips/bus.c:1.69 Wed Nov 16 19:39:38 2016
+++ src/sys/arch/sgimips/sgimips/bus.c Wed Dec 20 15:29:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.69 2016/11/16 19:39:38 macallan Exp $ */
+/* $NetBSD: bus.c,v 1.70 2023/12/20 15:29:07 thorpej Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.69 2016/11/16 19:39:38 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.70 2023/12/20 15:29:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.69
#include <sys/bswap.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/proc.h>
#include <sys/mbuf.h>
Index: src/sys/arch/sgimips/sgimips/machdep.c
diff -u src/sys/arch/sgimips/sgimips/machdep.c:1.152 src/sys/arch/sgimips/sgimips/machdep.c:1.153
--- src/sys/arch/sgimips/sgimips/machdep.c:1.152 Thu Aug 12 20:53:18 2021
+++ src/sys/arch/sgimips/sgimips/machdep.c Wed Dec 20 15:29:08 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.152 2021/08/12 20:53:18 andvar Exp $ */
+/* $NetBSD: machdep.c,v 1.153 2023/12/20 15:29:08 thorpej Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.152 2021/08/12 20:53:18 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.153 2023/12/20 15:29:08 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -54,7 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <sys/reboot.h>
#include <sys/conf.h>
#include <sys/file.h>
-#include <sys/malloc.h>
#include <sys/intr.h>
#include <sys/mbuf.h>
#include <sys/msgbuf.h>
