Module Name: src
Committed By: thorpej
Date: Sun Sep 25 18:03:04 UTC 2022
Modified Files:
src/sys/dev/sbus: be.c bwtwo_sbus.c cgsix_sbus.c cgthree_sbus.c
dma_sbus.c if_gem_sbus.c if_hme_sbus.c if_le.c if_le_lebuffer.c
if_le_ledma.c lebuffer.c p9100.c qe.c qec.c tcx.c xbox.c
Log Message:
Remove unnecessary include of <sys/malloc.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/sys/dev/sbus/be.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/sbus/bwtwo_sbus.c \
src/sys/dev/sbus/if_le_lebuffer.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/sbus/cgsix_sbus.c \
src/sys/dev/sbus/cgthree_sbus.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/sbus/dma_sbus.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/sbus/if_gem_sbus.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/sbus/if_hme_sbus.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/sbus/if_le.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/sbus/if_le_ledma.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/sbus/lebuffer.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/sbus/p9100.c
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/sbus/qe.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/sbus/qec.c
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/sbus/tcx.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/sbus/xbox.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/dev/sbus/be.c
diff -u src/sys/dev/sbus/be.c:1.97 src/sys/dev/sbus/be.c:1.98
--- src/sys/dev/sbus/be.c:1.97 Fri Sep 2 23:48:10 2022
+++ src/sys/dev/sbus/be.c Sun Sep 25 18:03:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: be.c,v 1.97 2022/09/02 23:48:10 thorpej Exp $ */
+/* $NetBSD: be.c,v 1.98 2022/09/25 18:03:04 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.97 2022/09/02 23:48:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.98 2022/09/25 18:03:04 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -72,7 +72,6 @@ __KERNEL_RCSID(0, "$NetBSD: be.c,v 1.97
#include <sys/socket.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <net/if.h>
#include <net/if_dl.h>
Index: src/sys/dev/sbus/bwtwo_sbus.c
diff -u src/sys/dev/sbus/bwtwo_sbus.c:1.29 src/sys/dev/sbus/bwtwo_sbus.c:1.30
--- src/sys/dev/sbus/bwtwo_sbus.c:1.29 Sat Sep 19 04:52:44 2009
+++ src/sys/dev/sbus/bwtwo_sbus.c Sun Sep 25 18:03:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtwo_sbus.c,v 1.29 2009/09/19 04:52:44 tsutsui Exp $ */
+/* $NetBSD: bwtwo_sbus.c,v 1.30 2022/09/25 18:03:04 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -79,13 +79,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bwtwo_sbus.c,v 1.29 2009/09/19 04:52:44 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwtwo_sbus.c,v 1.30 2022/09/25 18:03:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/ioctl.h>
-#include <sys/malloc.h>
#include <sys/mman.h>
#include <sys/tty.h>
#include <sys/conf.h>
Index: src/sys/dev/sbus/if_le_lebuffer.c
diff -u src/sys/dev/sbus/if_le_lebuffer.c:1.29 src/sys/dev/sbus/if_le_lebuffer.c:1.30
--- src/sys/dev/sbus/if_le_lebuffer.c:1.29 Wed May 29 06:21:58 2019
+++ src/sys/dev/sbus/if_le_lebuffer.c Sun Sep 25 18:03:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_lebuffer.c,v 1.29 2019/05/29 06:21:58 msaitoh Exp $ */
+/* $NetBSD: if_le_lebuffer.c,v 1.30 2022/09/25 18:03:04 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.29 2019/05/29 06:21:58 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.30 2022/09/25 18:03:04 thorpej Exp $");
#include "opt_inet.h"
@@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_lebuff
#include <sys/syslog.h>
#include <sys/socket.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <net/if.h>
#include <net/if_ether.h>
Index: src/sys/dev/sbus/cgsix_sbus.c
diff -u src/sys/dev/sbus/cgsix_sbus.c:1.31 src/sys/dev/sbus/cgsix_sbus.c:1.32
--- src/sys/dev/sbus/cgsix_sbus.c:1.31 Wed Mar 9 17:53:39 2022
+++ src/sys/dev/sbus/cgsix_sbus.c Sun Sep 25 18:03:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix_sbus.c,v 1.31 2022/03/09 17:53:39 macallan Exp $ */
+/* $NetBSD: cgsix_sbus.c,v 1.32 2022/09/25 18:03:04 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,14 +34,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix_sbus.c,v 1.31 2022/03/09 17:53:39 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix_sbus.c,v 1.32 2022/09/25 18:03:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
-#include <sys/malloc.h>
#include <sys/mman.h>
#include <sys/tty.h>
#include <sys/conf.h>
Index: src/sys/dev/sbus/cgthree_sbus.c
diff -u src/sys/dev/sbus/cgthree_sbus.c:1.31 src/sys/dev/sbus/cgthree_sbus.c:1.32
--- src/sys/dev/sbus/cgthree_sbus.c:1.31 Thu Apr 21 18:10:57 2016
+++ src/sys/dev/sbus/cgthree_sbus.c Sun Sep 25 18:03:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthree_sbus.c,v 1.31 2016/04/21 18:10:57 macallan Exp $ */
+/* $NetBSD: cgthree_sbus.c,v 1.32 2022/09/25 18:03:04 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,14 +78,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.31 2016/04/21 18:10:57 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.32 2022/09/25 18:03:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
-#include <sys/malloc.h>
#include <sys/mman.h>
#include <sys/tty.h>
#include <sys/conf.h>
Index: src/sys/dev/sbus/dma_sbus.c
diff -u src/sys/dev/sbus/dma_sbus.c:1.39 src/sys/dev/sbus/dma_sbus.c:1.40
--- src/sys/dev/sbus/dma_sbus.c:1.39 Sat Jan 22 11:49:18 2022
+++ src/sys/dev/sbus/dma_sbus.c Sun Sep 25 18:03:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: dma_sbus.c,v 1.39 2022/01/22 11:49:18 thorpej Exp $ */
+/* $NetBSD: dma_sbus.c,v 1.40 2022/09/25 18:03:04 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -59,14 +59,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.39 2022/01/22 11:49:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.40 2022/09/25 18:03:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/errno.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/bus.h>
#include <sys/intr.h>
Index: src/sys/dev/sbus/if_gem_sbus.c
diff -u src/sys/dev/sbus/if_gem_sbus.c:1.13 src/sys/dev/sbus/if_gem_sbus.c:1.14
--- src/sys/dev/sbus/if_gem_sbus.c:1.13 Thu Sep 17 16:28:12 2009
+++ src/sys/dev/sbus/if_gem_sbus.c Sun Sep 25 18:03:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gem_sbus.c,v 1.13 2009/09/17 16:28:12 tsutsui Exp $ */
+/* $NetBSD: if_gem_sbus.c,v 1.14 2022/09/25 18:03:04 thorpej Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -34,13 +34,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gem_sbus.c,v 1.13 2009/09/17 16:28:12 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gem_sbus.c,v 1.14 2022/09/25 18:03:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/socket.h>
#include <net/if.h>
Index: src/sys/dev/sbus/if_hme_sbus.c
diff -u src/sys/dev/sbus/if_hme_sbus.c:1.33 src/sys/dev/sbus/if_hme_sbus.c:1.34
--- src/sys/dev/sbus/if_hme_sbus.c:1.33 Thu Sep 17 16:28:12 2009
+++ src/sys/dev/sbus/if_hme_sbus.c Sun Sep 25 18:03:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hme_sbus.c,v 1.33 2009/09/17 16:28:12 tsutsui Exp $ */
+/* $NetBSD: if_hme_sbus.c,v 1.34 2022/09/25 18:03:04 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,13 +34,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.33 2009/09/17 16:28:12 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.34 2022/09/25 18:03:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/socket.h>
#include <net/if.h>
Index: src/sys/dev/sbus/if_le.c
diff -u src/sys/dev/sbus/if_le.c:1.42 src/sys/dev/sbus/if_le.c:1.43
--- src/sys/dev/sbus/if_le.c:1.42 Sun May 29 10:43:46 2022
+++ src/sys/dev/sbus/if_le.c Sun Sep 25 18:03:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le.c,v 1.42 2022/05/29 10:43:46 rin Exp $ */
+/* $NetBSD: if_le.c,v 1.43 2022/09/25 18:03:04 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.42 2022/05/29 10:43:46 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.43 2022/09/25 18:03:04 thorpej Exp $");
#include "opt_inet.h"
@@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.
#include <sys/syslog.h>
#include <sys/socket.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <net/if.h>
#include <net/if_ether.h>
Index: src/sys/dev/sbus/if_le_ledma.c
diff -u src/sys/dev/sbus/if_le_ledma.c:1.37 src/sys/dev/sbus/if_le_ledma.c:1.38
--- src/sys/dev/sbus/if_le_ledma.c:1.37 Sun May 29 10:43:46 2022
+++ src/sys/dev/sbus/if_le_ledma.c Sun Sep 25 18:03:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_ledma.c,v 1.37 2022/05/29 10:43:46 rin Exp $ */
+/* $NetBSD: if_le_ledma.c,v 1.38 2022/09/25 18:03:04 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_ledma.c,v 1.37 2022/05/29 10:43:46 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_ledma.c,v 1.38 2022/09/25 18:03:04 thorpej Exp $");
#include "opt_inet.h"
@@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_ledma.
#include <sys/syslog.h>
#include <sys/socket.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <net/if.h>
#include <net/if_ether.h>
Index: src/sys/dev/sbus/lebuffer.c
diff -u src/sys/dev/sbus/lebuffer.c:1.40 src/sys/dev/sbus/lebuffer.c:1.41
--- src/sys/dev/sbus/lebuffer.c:1.40 Sat Jan 22 11:49:18 2022
+++ src/sys/dev/sbus/lebuffer.c Sun Sep 25 18:03:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: lebuffer.c,v 1.40 2022/01/22 11:49:18 thorpej Exp $ */
+/* $NetBSD: lebuffer.c,v 1.41 2022/09/25 18:03:04 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,14 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.40 2022/01/22 11:49:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.41 2022/09/25 18:03:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/errno.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/bus.h>
#include <machine/autoconf.h>
Index: src/sys/dev/sbus/p9100.c
diff -u src/sys/dev/sbus/p9100.c:1.65 src/sys/dev/sbus/p9100.c:1.66
--- src/sys/dev/sbus/p9100.c:1.65 Sat Aug 7 16:19:15 2021
+++ src/sys/dev/sbus/p9100.c Sun Sep 25 18:03:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: p9100.c,v 1.65 2021/08/07 16:19:15 thorpej Exp $ */
+/* $NetBSD: p9100.c,v 1.66 2022/09/25 18:03:04 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
@@ -38,14 +38,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.65 2021/08/07 16:19:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.66 2022/09/25 18:03:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
-#include <sys/malloc.h>
#include <sys/mman.h>
#include <sys/tty.h>
#include <sys/conf.h>
Index: src/sys/dev/sbus/qe.c
diff -u src/sys/dev/sbus/qe.c:1.78 src/sys/dev/sbus/qe.c:1.79
--- src/sys/dev/sbus/qe.c:1.78 Fri Sep 2 23:48:11 2022
+++ src/sys/dev/sbus/qe.c Sun Sep 25 18:03:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: qe.c,v 1.78 2022/09/02 23:48:11 thorpej Exp $ */
+/* $NetBSD: qe.c,v 1.79 2022/09/25 18:03:04 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.78 2022/09/02 23:48:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.79 2022/09/25 18:03:04 thorpej Exp $");
#define QEDEBUG
@@ -82,7 +82,6 @@ __KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.78
#include <sys/socket.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <net/if.h>
#include <net/if_dl.h>
Index: src/sys/dev/sbus/qec.c
diff -u src/sys/dev/sbus/qec.c:1.54 src/sys/dev/sbus/qec.c:1.55
--- src/sys/dev/sbus/qec.c:1.54 Sat Jan 22 11:49:18 2022
+++ src/sys/dev/sbus/qec.c Sun Sep 25 18:03:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: qec.c,v 1.54 2022/01/22 11:49:18 thorpej Exp $ */
+/* $NetBSD: qec.c,v 1.55 2022/09/25 18:03:04 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,14 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.54 2022/01/22 11:49:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.55 2022/09/25 18:03:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/errno.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/bus.h>
#include <sys/intr.h>
Index: src/sys/dev/sbus/tcx.c
diff -u src/sys/dev/sbus/tcx.c:1.60 src/sys/dev/sbus/tcx.c:1.61
--- src/sys/dev/sbus/tcx.c:1.60 Sat Aug 7 16:19:15 2021
+++ src/sys/dev/sbus/tcx.c Sun Sep 25 18:03:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tcx.c,v 1.60 2021/08/07 16:19:15 thorpej Exp $ */
+/* $NetBSD: tcx.c,v 1.61 2022/09/25 18:03:04 thorpej Exp $ */
/*
* Copyright (c) 1996, 1998, 2009 The NetBSD Foundation, Inc.
@@ -38,14 +38,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.60 2021/08/07 16:19:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.61 2022/09/25 18:03:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
-#include <sys/malloc.h>
#include <sys/mman.h>
#include <sys/tty.h>
#include <sys/conf.h>
Index: src/sys/dev/sbus/xbox.c
diff -u src/sys/dev/sbus/xbox.c:1.25 src/sys/dev/sbus/xbox.c:1.26
--- src/sys/dev/sbus/xbox.c:1.25 Fri Jan 21 19:14:14 2022
+++ src/sys/dev/sbus/xbox.c Sun Sep 25 18:03:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: xbox.c,v 1.25 2022/01/21 19:14:14 thorpej Exp $ */
+/* $NetBSD: xbox.c,v 1.26 2022/09/25 18:03:04 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,10 +34,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.25 2022/01/21 19:14:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.26 2022/09/25 18:03:04 thorpej Exp $");
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/systm.h>
#include <sys/device.h>
