Module Name: src
Committed By: thorpej
Date: Wed Dec 20 13:55:19 UTC 2023
Modified Files:
src/sys/arch/evbarm/armadillo: armadillo9_com.c
src/sys/arch/evbarm/g42xxeb: g42xxeb_kmkbd.c g42xxeb_lcd.c gb225_pcic.c
src/sys/arch/evbarm/gumstix: gxlcd.c gxpcic.c
src/sys/arch/evbarm/hdl_g: btn_obio.c
src/sys/arch/evbarm/ifpga: ifpga_pci.c
src/sys/arch/evbarm/integrator: int_bus_dma.c
src/sys/arch/evbarm/iq31244: wdc_obio.c
src/sys/arch/evbarm/ixm1200: ixpcom_ixm.c
src/sys/arch/evbarm/iyonix: autoconf.c
src/sys/arch/evbarm/lubbock: lubbock_lcd.c lubbock_pcic.c
src/sys/arch/evbarm/mini2440: audio_mini2440.c mini2440_lcd.c
src/sys/arch/evbarm/mpcsa: mpcsa_leds.c
src/sys/arch/evbarm/smdk2xx0: smdk2410_lcd.c
src/sys/arch/evbarm/tsarm: epcom_ts.c tspld.c wdc_ts.c
src/sys/arch/evbarm/tsarm/isa: isa_io.c isa_machdep.c
Log Message:
Remove unnecessary <sys/malloc.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/armadillo/armadillo9_com.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/g42xxeb/gb225_pcic.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/gumstix/gxlcd.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/gumstix/gxpcic.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/hdl_g/btn_obio.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/ifpga/ifpga_pci.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/integrator/int_bus_dma.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/iq31244/wdc_obio.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/ixm1200/ixpcom_ixm.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/iyonix/autoconf.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/lubbock/lubbock_lcd.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/lubbock/lubbock_pcic.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/mini2440/audio_mini2440.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/mini2440/mini2440_lcd.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/mpcsa/mpcsa_leds.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/tsarm/epcom_ts.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/tsarm/tspld.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/tsarm/wdc_ts.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/tsarm/isa/isa_io.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/tsarm/isa/isa_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/evbarm/armadillo/armadillo9_com.c
diff -u src/sys/arch/evbarm/armadillo/armadillo9_com.c:1.6 src/sys/arch/evbarm/armadillo/armadillo9_com.c:1.7
--- src/sys/arch/evbarm/armadillo/armadillo9_com.c:1.6 Mon Nov 12 18:00:38 2012
+++ src/sys/arch/evbarm/armadillo/armadillo9_com.c Wed Dec 20 13:55:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: armadillo9_com.c,v 1.6 2012/11/12 18:00:38 skrll Exp $ */
+/* $NetBSD: armadillo9_com.c,v 1.7 2023/12/20 13:55:17 thorpej Exp $ */
/*
* Copyright (c) 2002
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_com.c,v 1.6 2012/11/12 18:00:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_com.c,v 1.7 2023/12/20 13:55:17 thorpej Exp $");
/* Front-end of epcom */
@@ -35,7 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: armadillo9_c
#include <sys/device.h>
#include <sys/systm.h>
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/termios.h>
Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c:1.16 src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c:1.17
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c:1.16 Sat Aug 7 16:18:49 2021
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c Wed Dec 20 13:55:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_kmkbd.c,v 1.16 2021/08/07 16:18:49 thorpej Exp $ */
+/* $NetBSD: g42xxeb_kmkbd.c,v 1.17 2023/12/20 13:55:17 thorpej Exp $ */
/*-
* Copyright (c) 2002, 2003, 2005 Genetec corp.
@@ -37,12 +37,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: g42xxeb_kmkbd.c,v 1.16 2021/08/07 16:18:49 thorpej Exp $" );
+__KERNEL_RCSID(0, "$NetBSD: g42xxeb_kmkbd.c,v 1.17 2023/12/20 13:55:17 thorpej Exp $" );
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/ioctl.h>
#include <sys/callout.h>
#include <sys/kernel.h> /* for hz */
Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c:1.18 src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c:1.19
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c:1.18 Sat Aug 7 16:18:49 2021
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c Wed Dec 20 13:55:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_lcd.c,v 1.18 2021/08/07 16:18:49 thorpej Exp $ */
+/* $NetBSD: g42xxeb_lcd.c,v 1.19 2023/12/20 13:55:17 thorpej Exp $ */
/*-
* Copyright (c) 2001, 2002, 2005 Genetec corp.
@@ -37,7 +37,6 @@
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/uio.h>
-#include <sys/malloc.h>
#include <dev/cons.h>
#include <dev/wscons/wsconsio.h>
Index: src/sys/arch/evbarm/g42xxeb/gb225_pcic.c
diff -u src/sys/arch/evbarm/g42xxeb/gb225_pcic.c:1.15 src/sys/arch/evbarm/g42xxeb/gb225_pcic.c:1.16
--- src/sys/arch/evbarm/g42xxeb/gb225_pcic.c:1.15 Sat Aug 7 16:18:49 2021
+++ src/sys/arch/evbarm/g42xxeb/gb225_pcic.c Wed Dec 20 13:55:17 2023
@@ -36,7 +36,6 @@
#include <sys/callout.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
-#include <sys/malloc.h>
#include <uvm/uvm.h>
#include <sys/bus.h>
Index: src/sys/arch/evbarm/gumstix/gxlcd.c
diff -u src/sys/arch/evbarm/gumstix/gxlcd.c:1.5 src/sys/arch/evbarm/gumstix/gxlcd.c:1.6
--- src/sys/arch/evbarm/gumstix/gxlcd.c:1.5 Sat Aug 7 16:18:49 2021
+++ src/sys/arch/evbarm/gumstix/gxlcd.c Wed Dec 20 13:55:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: gxlcd.c,v 1.5 2021/08/07 16:18:49 thorpej Exp $ */
+/* $NetBSD: gxlcd.c,v 1.6 2023/12/20 13:55:17 thorpej Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
@@ -42,13 +42,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gxlcd.c,v 1.5 2021/08/07 16:18:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gxlcd.c,v 1.6 2023/12/20 13:55:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/uio.h>
-#include <sys/malloc.h>
#include <dev/cons.h>
#include <dev/wscons/wsconsio.h>
Index: src/sys/arch/evbarm/gumstix/gxpcic.c
diff -u src/sys/arch/evbarm/gumstix/gxpcic.c:1.14 src/sys/arch/evbarm/gumstix/gxpcic.c:1.15
--- src/sys/arch/evbarm/gumstix/gxpcic.c:1.14 Fri Nov 5 07:39:22 2021
+++ src/sys/arch/evbarm/gumstix/gxpcic.c Wed Dec 20 13:55:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: gxpcic.c,v 1.14 2021/11/05 07:39:22 skrll Exp $ */
+/* $NetBSD: gxpcic.c,v 1.15 2023/12/20 13:55:17 thorpej Exp $ */
/*
* Copyright (C) 2005, 2006 WIDE Project and SOUM Corporation.
* All rights reserved.
@@ -68,7 +68,6 @@
#include <sys/callout.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
-#include <sys/malloc.h>
#include <uvm/uvm.h>
#include <sys/bus.h>
Index: src/sys/arch/evbarm/hdl_g/btn_obio.c
diff -u src/sys/arch/evbarm/hdl_g/btn_obio.c:1.4 src/sys/arch/evbarm/hdl_g/btn_obio.c:1.5
--- src/sys/arch/evbarm/hdl_g/btn_obio.c:1.4 Sat Oct 27 17:17:47 2012
+++ src/sys/arch/evbarm/hdl_g/btn_obio.c Wed Dec 20 13:55:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: btn_obio.c,v 1.4 2012/10/27 17:17:47 chs Exp $ */
+/* $NetBSD: btn_obio.c,v 1.5 2023/12/20 13:55:17 thorpej Exp $ */
/*-
* Copyright (C) 2005, 2006 NONAKA Kimihiro <non...@netbsd.org>
@@ -26,13 +26,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btn_obio.c,v 1.4 2012/10/27 17:17:47 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btn_obio.c,v 1.5 2023/12/20 13:55:17 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/conf.h>
#include <sys/ioctl.h>
Index: src/sys/arch/evbarm/ifpga/ifpga_pci.c
diff -u src/sys/arch/evbarm/ifpga/ifpga_pci.c:1.25 src/sys/arch/evbarm/ifpga/ifpga_pci.c:1.26
--- src/sys/arch/evbarm/ifpga/ifpga_pci.c:1.25 Mon Nov 26 12:21:32 2018
+++ src/sys/arch/evbarm/ifpga/ifpga_pci.c Wed Dec 20 13:55:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ifpga_pci.c,v 1.25 2018/11/26 12:21:32 jmcneill Exp $ */
+/* $NetBSD: ifpga_pci.c,v 1.26 2023/12/20 13:55:17 thorpej Exp $ */
/*
* Copyright (c) 2001 ARM Ltd
@@ -64,12 +64,11 @@
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ifpga_pci.c,v 1.25 2018/11/26 12:21:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ifpga_pci.c,v 1.26 2023/12/20 13:55:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
-#include <sys/malloc.h>
#include <sys/device.h>
#include <evbarm/integrator/int_bus_dma.h>
Index: src/sys/arch/evbarm/integrator/int_bus_dma.c
diff -u src/sys/arch/evbarm/integrator/int_bus_dma.c:1.18 src/sys/arch/evbarm/integrator/int_bus_dma.c:1.19
--- src/sys/arch/evbarm/integrator/int_bus_dma.c:1.18 Tue Sep 18 14:42:19 2012
+++ src/sys/arch/evbarm/integrator/int_bus_dma.c Wed Dec 20 13:55:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: int_bus_dma.c,v 1.18 2012/09/18 14:42:19 matt Exp $ */
+/* $NetBSD: int_bus_dma.c,v 1.19 2023/12/20 13:55:17 thorpej Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -42,12 +42,11 @@
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: int_bus_dma.c,v 1.18 2012/09/18 14:42:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: int_bus_dma.c,v 1.19 2023/12/20 13:55:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/evbarm/iq31244/wdc_obio.c
diff -u src/sys/arch/evbarm/iq31244/wdc_obio.c:1.11 src/sys/arch/evbarm/iq31244/wdc_obio.c:1.12
--- src/sys/arch/evbarm/iq31244/wdc_obio.c:1.11 Fri Oct 20 07:06:06 2017
+++ src/sys/arch/evbarm/iq31244/wdc_obio.c Wed Dec 20 13:55:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_obio.c,v 1.11 2017/10/20 07:06:06 jdolecek Exp $ */
+/* $NetBSD: wdc_obio.c,v 1.12 2023/12/20 13:55:17 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2003, 2005 The NetBSD Foundation, Inc.
@@ -30,12 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.11 2017/10/20 07:06:06 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.12 2023/12/20 13:55:17 thorpej Exp $");
#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/evbarm/ixm1200/ixpcom_ixm.c
diff -u src/sys/arch/evbarm/ixm1200/ixpcom_ixm.c:1.11 src/sys/arch/evbarm/ixm1200/ixpcom_ixm.c:1.12
--- src/sys/arch/evbarm/ixm1200/ixpcom_ixm.c:1.11 Sat Oct 27 17:17:48 2012
+++ src/sys/arch/evbarm/ixm1200/ixpcom_ixm.c Wed Dec 20 13:55:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixpcom_ixm.c,v 1.11 2012/10/27 17:17:48 chs Exp $ */
+/* $NetBSD: ixpcom_ixm.c,v 1.12 2023/12/20 13:55:18 thorpej Exp $ */
/*
* Copyright (c) 2002
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixpcom_ixm.c,v 1.11 2012/10/27 17:17:48 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixpcom_ixm.c,v 1.12 2023/12/20 13:55:18 thorpej Exp $");
/* Front-end of ixpcom */
@@ -35,7 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: ixpcom_ixm.c
#include <sys/device.h>
#include <sys/systm.h>
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/termios.h>
Index: src/sys/arch/evbarm/iyonix/autoconf.c
diff -u src/sys/arch/evbarm/iyonix/autoconf.c:1.1 src/sys/arch/evbarm/iyonix/autoconf.c:1.2
--- src/sys/arch/evbarm/iyonix/autoconf.c:1.1 Thu Feb 14 21:47:52 2019
+++ src/sys/arch/evbarm/iyonix/autoconf.c Wed Dec 20 13:55:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.1 2019/02/14 21:47:52 macallan Exp $ */
+/* $NetBSD: autoconf.c,v 1.2 2023/12/20 13:55:18 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.1 2019/02/14 21:47:52 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.2 2023/12/20 13:55:18 thorpej Exp $");
#include "opt_md.h"
@@ -41,7 +41,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 <net/if.h>
#include <net/if_ether.h>
Index: src/sys/arch/evbarm/lubbock/lubbock_lcd.c
diff -u src/sys/arch/evbarm/lubbock/lubbock_lcd.c:1.17 src/sys/arch/evbarm/lubbock/lubbock_lcd.c:1.18
--- src/sys/arch/evbarm/lubbock/lubbock_lcd.c:1.17 Sat Aug 7 16:18:50 2021
+++ src/sys/arch/evbarm/lubbock/lubbock_lcd.c Wed Dec 20 13:55:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lubbock_lcd.c,v 1.17 2021/08/07 16:18:50 thorpej Exp $ */
+/* $NetBSD: lubbock_lcd.c,v 1.18 2023/12/20 13:55:18 thorpej Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
@@ -40,13 +40,12 @@
* LCD panel geometry
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_lcd.c,v 1.17 2021/08/07 16:18:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_lcd.c,v 1.18 2023/12/20 13:55:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/uio.h>
-#include <sys/malloc.h>
#include <dev/cons.h>
#include <dev/wscons/wsconsio.h>
Index: src/sys/arch/evbarm/lubbock/lubbock_pcic.c
diff -u src/sys/arch/evbarm/lubbock/lubbock_pcic.c:1.7 src/sys/arch/evbarm/lubbock/lubbock_pcic.c:1.8
--- src/sys/arch/evbarm/lubbock/lubbock_pcic.c:1.7 Fri Jul 1 20:42:37 2011
+++ src/sys/arch/evbarm/lubbock/lubbock_pcic.c Wed Dec 20 13:55:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lubbock_pcic.c,v 1.7 2011/07/01 20:42:37 dyoung Exp $ */
+/* $NetBSD: lubbock_pcic.c,v 1.8 2023/12/20 13:55:18 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_pcic.c,v 1.7 2011/07/01 20:42:37 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_pcic.c,v 1.8 2023/12/20 13:55:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: lubbock_pcic
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
-#include <sys/malloc.h>
#include <sys/bus.h>
Index: src/sys/arch/evbarm/mini2440/audio_mini2440.c
diff -u src/sys/arch/evbarm/mini2440/audio_mini2440.c:1.5 src/sys/arch/evbarm/mini2440/audio_mini2440.c:1.6
--- src/sys/arch/evbarm/mini2440/audio_mini2440.c:1.5 Sat Feb 29 05:51:11 2020
+++ src/sys/arch/evbarm/mini2440/audio_mini2440.c Wed Dec 20 13:55:18 2023
@@ -30,7 +30,6 @@
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/fcntl.h>
#include <sys/audioio.h>
Index: src/sys/arch/evbarm/mini2440/mini2440_lcd.c
diff -u src/sys/arch/evbarm/mini2440/mini2440_lcd.c:1.6 src/sys/arch/evbarm/mini2440/mini2440_lcd.c:1.7
--- src/sys/arch/evbarm/mini2440/mini2440_lcd.c:1.6 Sat Aug 7 16:18:50 2021
+++ src/sys/arch/evbarm/mini2440/mini2440_lcd.c Wed Dec 20 13:55:18 2023
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mini2440_lcd.c,v 1.6 2021/08/07 16:18:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mini2440_lcd.c,v 1.7 2023/12/20 13:55:18 thorpej Exp $");
/*
* LCD driver for FriendlyARM MINI2440.
@@ -75,7 +75,6 @@ __KERNEL_RCSID(0, "$NetBSD: mini2440_lcd
#include <sys/conf.h>
#include <sys/event.h>
#include <sys/uio.h>
-#include <sys/malloc.h>
#include <dev/cons.h>
#include <dev/wscons/wsconsio.h>
Index: src/sys/arch/evbarm/mpcsa/mpcsa_leds.c
diff -u src/sys/arch/evbarm/mpcsa/mpcsa_leds.c:1.9 src/sys/arch/evbarm/mpcsa/mpcsa_leds.c:1.10
--- src/sys/arch/evbarm/mpcsa/mpcsa_leds.c:1.9 Wed Jan 19 05:21:44 2022
+++ src/sys/arch/evbarm/mpcsa/mpcsa_leds.c Wed Dec 20 13:55:18 2023
@@ -1,5 +1,5 @@
-/* $Id: mpcsa_leds.c,v 1.9 2022/01/19 05:21:44 thorpej Exp $ */
-/* $NetBSD: mpcsa_leds.c,v 1.9 2022/01/19 05:21:44 thorpej Exp $ */
+/* $Id: mpcsa_leds.c,v 1.10 2023/12/20 13:55:18 thorpej Exp $ */
+/* $NetBSD: mpcsa_leds.c,v 1.10 2023/12/20 13:55:18 thorpej Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpcsa_leds.c,v 1.9 2022/01/19 05:21:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpcsa_leds.c,v 1.10 2023/12/20 13:55:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -139,7 +139,8 @@ mpcsa_leds_attach(device_t parent, devic
aprint_naive(": output buffer\n");
aprint_normal(": 74HC595 or compatible shift register(s)\n");
- error = spi_configure(self, sa->sa_handle, SPI_MODE_0, 10000000);
+ error = spi_configure(self, sa->sa_handle, SPI_MODE_0,
+ SPI_FREQ_MHz(10));
if (error) {
return;
}
Index: src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c:1.12 src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c:1.13
--- src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c:1.12 Sat Aug 7 16:18:50 2021
+++ src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c Wed Dec 20 13:55:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2410_lcd.c,v 1.12 2021/08/07 16:18:50 thorpej Exp $ */
+/* $NetBSD: smdk2410_lcd.c,v 1.13 2023/12/20 13:55:18 thorpej Exp $ */
/*
* Copyright (c) 2004 Genetec Corporation. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2410_lcd.c,v 1.12 2021/08/07 16:18:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2410_lcd.c,v 1.13 2023/12/20 13:55:18 thorpej Exp $");
/*
* LCD driver for Samsung SMDK2410.
@@ -47,7 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: smdk2410_lcd
#include <sys/conf.h>
#include <sys/event.h>
#include <sys/uio.h>
-#include <sys/malloc.h>
#include <dev/cons.h>
#include <dev/wscons/wsconsio.h>
Index: src/sys/arch/evbarm/tsarm/epcom_ts.c
diff -u src/sys/arch/evbarm/tsarm/epcom_ts.c:1.8 src/sys/arch/evbarm/tsarm/epcom_ts.c:1.9
--- src/sys/arch/evbarm/tsarm/epcom_ts.c:1.8 Mon Nov 12 18:00:40 2012
+++ src/sys/arch/evbarm/tsarm/epcom_ts.c Wed Dec 20 13:55:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: epcom_ts.c,v 1.8 2012/11/12 18:00:40 skrll Exp $ */
+/* $NetBSD: epcom_ts.c,v 1.9 2023/12/20 13:55:18 thorpej Exp $ */
/*
* Copyright (c) 2002
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epcom_ts.c,v 1.8 2012/11/12 18:00:40 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epcom_ts.c,v 1.9 2023/12/20 13:55:18 thorpej Exp $");
/* Front-end of epcom */
@@ -35,7 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: epcom_ts.c,v
#include <sys/device.h>
#include <sys/systm.h>
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/termios.h>
Index: src/sys/arch/evbarm/tsarm/tspld.c
diff -u src/sys/arch/evbarm/tsarm/tspld.c:1.26 src/sys/arch/evbarm/tsarm/tspld.c:1.27
--- src/sys/arch/evbarm/tsarm/tspld.c:1.26 Sat Aug 7 16:18:50 2021
+++ src/sys/arch/evbarm/tsarm/tspld.c Wed Dec 20 13:55:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: tspld.c,v 1.26 2021/08/07 16:18:50 thorpej Exp $ */
+/* $NetBSD: tspld.c,v 1.27 2023/12/20 13:55:18 thorpej Exp $ */
/*-
* Copyright (c) 2004 Jesse Off
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tspld.c,v 1.26 2021/08/07 16:18:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tspld.c,v 1.27 2023/12/20 13:55:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -459,7 +459,6 @@ void
tspld_callback(device_t self)
{
#if NISA > 0
- extern void isa_bs_mallocok(void);
struct isabus_attach_args iba;
/*
@@ -468,7 +467,6 @@ tspld_callback(device_t self)
memset(&iba, 0, sizeof(iba));
iba.iba_iot = &isa_io_bs_tag;
iba.iba_memt = &isa_mem_bs_tag;
- isa_bs_mallocok();
config_found(self, &iba, isabusprint,
CFARGS(.iattr = "isabus"));
#endif
Index: src/sys/arch/evbarm/tsarm/wdc_ts.c
diff -u src/sys/arch/evbarm/tsarm/wdc_ts.c:1.11 src/sys/arch/evbarm/tsarm/wdc_ts.c:1.12
--- src/sys/arch/evbarm/tsarm/wdc_ts.c:1.11 Fri Oct 20 07:06:06 2017
+++ src/sys/arch/evbarm/tsarm/wdc_ts.c Wed Dec 20 13:55:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_ts.c,v 1.11 2017/10/20 07:06:06 jdolecek Exp $ */
+/* $NetBSD: wdc_ts.c,v 1.12 2023/12/20 13:55:18 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -30,12 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_ts.c,v 1.11 2017/10/20 07:06:06 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_ts.c,v 1.12 2023/12/20 13:55:18 thorpej Exp $");
#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/evbarm/tsarm/isa/isa_io.c
diff -u src/sys/arch/evbarm/tsarm/isa/isa_io.c:1.12 src/sys/arch/evbarm/tsarm/isa/isa_io.c:1.13
--- src/sys/arch/evbarm/tsarm/isa/isa_io.c:1.12 Fri Mar 16 17:56:33 2018
+++ src/sys/arch/evbarm/tsarm/isa/isa_io.c Wed Dec 20 13:55:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_io.c,v 1.12 2018/03/16 17:56:33 ryo Exp $ */
+/* $NetBSD: isa_io.c,v 1.13 2023/12/20 13:55:18 thorpej Exp $ */
/*
* Copyright 1997
@@ -38,12 +38,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.12 2018/03/16 17:56:33 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.13 2023/12/20 13:55:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/extent.h>
+#include <sys/vmem_impl.h>
#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/isa_machdep.h>
@@ -52,7 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1
bs_protos(isa);
bs_protos(bs_notimpl);
-void isa_bs_mallocok(void);
/*
* Declare the isa bus space tags
@@ -222,34 +220,59 @@ struct bus_space isa_mem_bs_tag = {
.bs_c_8 = bs_notimpl_bs_c_8,
};
-static long isaio_ex_storage[EXTENT_FIXED_STORAGE_SIZE(8) / sizeof(long)];
-static long isamem_ex_storage[EXTENT_FIXED_STORAGE_SIZE(8) / sizeof(long)];
-static int malloc_safe = 0;
-struct extent *isaio_ex;
-struct extent *isamem_ex;
+#define ISAIO_BTAG_COUNT VMEM_EST_BTCOUNT(1, 8)
+#define ISAMEM_BTAG_COUNT VMEM_EST_BTCOUNT(1, 8)
-void
-isa_bs_mallocok(void)
-{
- malloc_safe = 1;
-}
+static struct vmem isaio_arena_store;
+static struct vmem isamem_arena_store;
+static struct vmem_btag isaio_btag_store[ISAIO_BTAG_COUNT];
+static struct vmem_btag isamem_btag_store[ISAMEM_BTAG_COUNT];
+static vmem_t *isaio_arena;
+static vmem_t *isamem_arena;
/* bus space functions */
void
isa_io_init(vaddr_t isa_io_addr, vaddr_t isa_mem_addr)
{
+ int error __diagused;
+
isa_io_bs_tag.bs_cookie = (void *)isa_io_addr;
isa_mem_bs_tag.bs_cookie = (void *)isa_mem_addr;
- isaio_ex = extent_create("isaio", 0x0, 0xffff,
- (void *)isaio_ex_storage, sizeof(isaio_ex_storage),
- EX_NOWAIT|EX_NOCOALESCE);
- isamem_ex = extent_create("isamem", 0x0, 0xfffff,
- (void *)isamem_ex_storage, sizeof(isamem_ex_storage),
- EX_NOWAIT|EX_NOCOALESCE);
- if (isaio_ex == NULL || isamem_ex == NULL)
- panic("isa_io_init(): can't alloc extent maps");
+ isaio_arena = vmem_init(&isaio_arena_store,
+ "isaio",
+ 0, /* addr */
+ 0, /* size */
+ 1, /* quantum */
+ NULL, /* importfn */
+ NULL, /* releasefn */
+ NULL, /* source */
+ 0, /* qcache_max */
+ VM_NOSLEEP | VM_PRIVTAGS,
+ IPL_NONE);
+ KASSERT(isaio_arena != NULL);
+
+ vmem_add_bts(isaio_arena, isaio_btag_store, ISAIO_BTAG_COUNT);
+ error = vmem_add(isaio_arena, 0x0, 0x10000, VM_NOSLEEP);
+ KASSERT(error == 0);
+
+ isamem_arena = vmem_init(&isamem_arena_store,
+ "isamem",
+ 0, /* addr */
+ 0, /* size */
+ 1, /* quantum */
+ NULL, /* importfn */
+ NULL, /* releasefn */
+ NULL, /* source */
+ 0, /* qcache_max */
+ VM_NOSLEEP | VM_PRIVTAGS,
+ IPL_NONE);
+ KASSERT(isamem_arena != NULL);
+
+ vmem_add_bts(isamem_arena, isamem_btag_store, ISAMEM_BTAG_COUNT);
+ error = vmem_add(isamem_arena, 0x0, 0x100000, VM_NOSLEEP);
+ KASSERT(error == 0);
}
/*
@@ -272,16 +295,15 @@ isa_mem_data_vaddr(void)
int
isa_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int cacheable, bus_space_handle_t *bshp)
{
- struct extent *ex;
+ vmem_t *vm;
int err;
if (t == isa_io_bs_tag.bs_cookie)
- ex = isaio_ex;
+ vm = isaio_arena;
else
- ex = isamem_ex;
-
- err = extent_alloc_region(ex, bpa, size,
- EX_NOWAIT|(malloc_safe ? EX_MALLOCOK : 0));
+ vm = isamem_arena;
+
+ err = vmem_xalloc_addr(vm, bpa, size, VM_NOSLEEP);
if (err)
return err;
@@ -314,19 +336,23 @@ isa_bs_alloc(
bus_addr_t *bpap,
bus_space_handle_t *bshp)
{
- struct extent *ex;
- u_long bpa;
+ vmem_t *vm;
+ vmem_addr_t bpa;
int err;
if (t == isa_io_bs_tag.bs_cookie)
- ex = isaio_ex;
+ vm = isaio_arena;
else
- ex = isamem_ex;
-
- err = extent_alloc_subregion(ex, rstart, rend, size, alignment,
- boundary, (EX_FAST|EX_NOWAIT|(malloc_safe ? EX_MALLOCOK : 0)),
- &bpa);
+ vm = isamem_arena;
+ err = vmem_xalloc(vm, size,
+ alignment, /* align */
+ 0, /* phase */
+ boundary, /* nocross */
+ rstart, /* minaddr */
+ rend, /* maxaddr */
+ VM_BESTFIT | VM_NOSLEEP,
+ &bpa);
if (err)
return err;
@@ -337,15 +363,14 @@ isa_bs_alloc(
void
isa_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
- struct extent *ex;
+ vmem_t *vm;
if (t == isa_io_bs_tag.bs_cookie)
- ex = isaio_ex;
+ vm = isaio_arena;
else
- ex = isamem_ex;
+ vm = isamem_arena;
- extent_free(ex, bsh - (bus_addr_t)t, size,
- EX_NOWAIT|(malloc_safe ? EX_MALLOCOK : 0));
+ vmem_xfree(vm, bsh - (bus_addr_t)t, size);
}
void *
Index: src/sys/arch/evbarm/tsarm/isa/isa_machdep.c
diff -u src/sys/arch/evbarm/tsarm/isa/isa_machdep.c:1.13 src/sys/arch/evbarm/tsarm/isa/isa_machdep.c:1.14
--- src/sys/arch/evbarm/tsarm/isa/isa_machdep.c:1.13 Sat Mar 8 18:08:16 2014
+++ src/sys/arch/evbarm/tsarm/isa/isa_machdep.c Wed Dec 20 13:55:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.13 2014/03/08 18:08:16 skrll Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.14 2023/12/20 13:55:18 thorpej Exp $ */
/*-
* Copyright (c) 1996-1998 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.13 2014/03/08 18:08:16 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.14 2023/12/20 13:55:18 thorpej Exp $");
#include "opt_irqstats.h"
@@ -77,7 +77,6 @@ __KERNEL_RCSID(0, "$NetBSD: isa_machdep.
#include <sys/kernel.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/proc.h>
#include <sys/bus.h>
