Module Name: src
Committed By: thorpej
Date: Sun Sep 25 17:33:19 UTC 2022
Modified Files:
src/sys/dev/cardbus: adv_cardbus.c if_ath_cardbus.c if_athn_cardbus.c
if_atw_cardbus.c if_bwi_cardbus.c if_fxp_cardbus.c if_ral_cardbus.c
if_rtk_cardbus.c if_rtw_cardbus.c if_tlp_cardbus.c rbus_ppb.c
siisata_cardbus.c
Log Message:
Remove unnecessary include of <sys/malloc.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/cardbus/adv_cardbus.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/cardbus/if_ath_cardbus.c \
src/sys/dev/cardbus/if_rtw_cardbus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/cardbus/if_athn_cardbus.c \
src/sys/dev/cardbus/if_bwi_cardbus.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/cardbus/if_atw_cardbus.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/cardbus/if_fxp_cardbus.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/cardbus/if_ral_cardbus.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/cardbus/if_rtk_cardbus.c
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/cardbus/if_tlp_cardbus.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/cardbus/rbus_ppb.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/cardbus/siisata_cardbus.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/cardbus/adv_cardbus.c
diff -u src/sys/dev/cardbus/adv_cardbus.c:1.30 src/sys/dev/cardbus/adv_cardbus.c:1.31
--- src/sys/dev/cardbus/adv_cardbus.c:1.30 Thu Jul 14 10:19:06 2016
+++ src/sys/dev/cardbus/adv_cardbus.c Sun Sep 25 17:33:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: adv_cardbus.c,v 1.30 2016/07/14 10:19:06 msaitoh Exp $ */
+/* $NetBSD: adv_cardbus.c,v 1.31 2022/09/25 17:33:19 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,11 +36,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.30 2016/07/14 10:19:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.31 2022/09/25 17:33:19 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/queue.h>
#include <sys/device.h>
Index: src/sys/dev/cardbus/if_ath_cardbus.c
diff -u src/sys/dev/cardbus/if_ath_cardbus.c:1.45 src/sys/dev/cardbus/if_ath_cardbus.c:1.46
--- src/sys/dev/cardbus/if_ath_cardbus.c:1.45 Fri Oct 7 20:47:42 2011
+++ src/sys/dev/cardbus/if_ath_cardbus.c Sun Sep 25 17:33:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_cardbus.c,v 1.45 2011/10/07 20:47:42 dyoung Exp $ */
+/* $NetBSD: if_ath_cardbus.c,v 1.46 2022/09/25 17:33:19 thorpej Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA <[email protected]>.
@@ -30,14 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.45 2011/10/07 20:47:42 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.46 2022/09/25 17:33:19 thorpej Exp $");
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
Index: src/sys/dev/cardbus/if_rtw_cardbus.c
diff -u src/sys/dev/cardbus/if_rtw_cardbus.c:1.45 src/sys/dev/cardbus/if_rtw_cardbus.c:1.46
--- src/sys/dev/cardbus/if_rtw_cardbus.c:1.45 Thu Jul 7 06:55:41 2016
+++ src/sys/dev/cardbus/if_rtw_cardbus.c Sun Sep 25 17:33:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtw_cardbus.c,v 1.45 2016/07/07 06:55:41 msaitoh Exp $ */
+/* $NetBSD: if_rtw_cardbus.c,v 1.46 2022/09/25 17:33:19 thorpej Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
@@ -64,14 +64,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.45 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.46 2022/09/25 17:33:19 thorpej Exp $");
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
Index: src/sys/dev/cardbus/if_athn_cardbus.c
diff -u src/sys/dev/cardbus/if_athn_cardbus.c:1.2 src/sys/dev/cardbus/if_athn_cardbus.c:1.3
--- src/sys/dev/cardbus/if_athn_cardbus.c:1.2 Wed Apr 3 14:20:02 2013
+++ src/sys/dev/cardbus/if_athn_cardbus.c Sun Sep 25 17:33:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_athn_cardbus.c,v 1.2 2013/04/03 14:20:02 christos Exp $ */
+/* $NetBSD: if_athn_cardbus.c,v 1.3 2022/09/25 17:33:19 thorpej Exp $ */
/* $OpenBSD: if_athn_cardbus.c,v 1.13 2011/01/08 10:02:32 damien Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_athn_cardbus.c,v 1.2 2013/04/03 14:20:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_cardbus.c,v 1.3 2022/09/25 17:33:19 thorpej Exp $");
#include "opt_inet.h"
@@ -32,7 +32,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_athn_card
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/callout.h>
#include <sys/device.h>
Index: src/sys/dev/cardbus/if_bwi_cardbus.c
diff -u src/sys/dev/cardbus/if_bwi_cardbus.c:1.2 src/sys/dev/cardbus/if_bwi_cardbus.c:1.3
--- src/sys/dev/cardbus/if_bwi_cardbus.c:1.2 Thu Apr 12 12:52:58 2012
+++ src/sys/dev/cardbus/if_bwi_cardbus.c Sun Sep 25 17:33:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bwi_cardbus.c,v 1.2 2012/04/12 12:52:58 nakayama Exp $ */
+/* $NetBSD: if_bwi_cardbus.c,v 1.3 2022/09/25 17:33:19 thorpej Exp $ */
/* $OpenBSD: if_bwi_cardbus.c,v 1.13 2010/08/06 05:26:24 mglocker Exp $ */
/*
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bwi_cardbus.c,v 1.2 2012/04/12 12:52:58 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bwi_cardbus.c,v 1.3 2022/09/25 17:33:19 thorpej Exp $");
#include "opt_inet.h"
@@ -32,7 +32,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_bwi_cardb
#include <sys/callout.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/sockio.h>
Index: src/sys/dev/cardbus/if_atw_cardbus.c
diff -u src/sys/dev/cardbus/if_atw_cardbus.c:1.36 src/sys/dev/cardbus/if_atw_cardbus.c:1.37
--- src/sys/dev/cardbus/if_atw_cardbus.c:1.36 Mon Aug 1 11:20:27 2011
+++ src/sys/dev/cardbus/if_atw_cardbus.c Sun Sep 25 17:33:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atw_cardbus.c,v 1.36 2011/08/01 11:20:27 drochner Exp $ */
+/* $NetBSD: if_atw_cardbus.c,v 1.37 2022/09/25 17:33:19 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000, 2003 The NetBSD Foundation, Inc.
@@ -36,14 +36,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.36 2011/08/01 11:20:27 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.37 2022/09/25 17:33:19 thorpej Exp $");
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
Index: src/sys/dev/cardbus/if_fxp_cardbus.c
diff -u src/sys/dev/cardbus/if_fxp_cardbus.c:1.52 src/sys/dev/cardbus/if_fxp_cardbus.c:1.53
--- src/sys/dev/cardbus/if_fxp_cardbus.c:1.52 Thu Jul 7 06:55:41 2016
+++ src/sys/dev/cardbus/if_fxp_cardbus.c Sun Sep 25 17:33:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fxp_cardbus.c,v 1.52 2016/07/07 06:55:41 msaitoh Exp $ */
+/* $NetBSD: if_fxp_cardbus.c,v 1.53 2022/09/25 17:33:19 thorpej Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,14 +34,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.52 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.53 2022/09/25 17:33:19 thorpej Exp $");
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
Index: src/sys/dev/cardbus/if_ral_cardbus.c
diff -u src/sys/dev/cardbus/if_ral_cardbus.c:1.25 src/sys/dev/cardbus/if_ral_cardbus.c:1.26
--- src/sys/dev/cardbus/if_ral_cardbus.c:1.25 Fri Dec 14 21:27:03 2018
+++ src/sys/dev/cardbus/if_ral_cardbus.c Sun Sep 25 17:33:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ral_cardbus.c,v 1.25 2018/12/14 21:27:03 jakllsch Exp $ */
+/* $NetBSD: if_ral_cardbus.c,v 1.26 2022/09/25 17:33:19 thorpej Exp $ */
/* $OpenBSD: if_ral_cardbus.c,v 1.6 2006/01/09 20:03:31 damien Exp $ */
/*-
@@ -22,7 +22,7 @@
* CardBus front-end for the Ralink RT2560/RT2561/RT2561S/RT2661 driver.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.25 2018/12/14 21:27:03 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.26 2022/09/25 17:33:19 thorpej Exp $");
#include <sys/param.h>
@@ -31,7 +31,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ral_cardb
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/callout.h>
#include <sys/device.h>
Index: src/sys/dev/cardbus/if_rtk_cardbus.c
diff -u src/sys/dev/cardbus/if_rtk_cardbus.c:1.48 src/sys/dev/cardbus/if_rtk_cardbus.c:1.49
--- src/sys/dev/cardbus/if_rtk_cardbus.c:1.48 Mon Apr 13 16:33:24 2015
+++ src/sys/dev/cardbus/if_rtk_cardbus.c Sun Sep 25 17:33:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtk_cardbus.c,v 1.48 2015/04/13 16:33:24 riastradh Exp $ */
+/* $NetBSD: if_rtk_cardbus.c,v 1.49 2022/09/25 17:33:19 thorpej Exp $ */
/*
* Copyright (c) 2000 Masanori Kanaoka
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.48 2015/04/13 16:33:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.49 2022/09/25 17:33:19 thorpej Exp $");
#include "opt_inet.h"
@@ -46,7 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_rtk_cardb
#include <sys/device.h>
#include <sys/sockio.h>
#include <sys/mbuf.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/socket.h>
Index: src/sys/dev/cardbus/if_tlp_cardbus.c
diff -u src/sys/dev/cardbus/if_tlp_cardbus.c:1.71 src/sys/dev/cardbus/if_tlp_cardbus.c:1.72
--- src/sys/dev/cardbus/if_tlp_cardbus.c:1.71 Thu Jul 14 10:19:06 2016
+++ src/sys/dev/cardbus/if_tlp_cardbus.c Sun Sep 25 17:33:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_cardbus.c,v 1.71 2016/07/14 10:19:06 msaitoh Exp $ */
+/* $NetBSD: if_tlp_cardbus.c,v 1.72 2022/09/25 17:33:19 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -36,14 +36,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.71 2016/07/14 10:19:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.72 2022/09/25 17:33:19 thorpej Exp $");
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
Index: src/sys/dev/cardbus/rbus_ppb.c
diff -u src/sys/dev/cardbus/rbus_ppb.c:1.49 src/sys/dev/cardbus/rbus_ppb.c:1.50
--- src/sys/dev/cardbus/rbus_ppb.c:1.49 Sat Aug 7 16:19:10 2021
+++ src/sys/dev/cardbus/rbus_ppb.c Sun Sep 25 17:33:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus_ppb.c,v 1.49 2021/08/07 16:19:10 thorpej Exp $ */
+/* $NetBSD: rbus_ppb.c,v 1.50 2022/09/25 17:33:19 thorpej Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,12 +34,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.49 2021/08/07 16:19:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.50 2022/09/25 17:33:19 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
Index: src/sys/dev/cardbus/siisata_cardbus.c
diff -u src/sys/dev/cardbus/siisata_cardbus.c:1.15 src/sys/dev/cardbus/siisata_cardbus.c:1.16
--- src/sys/dev/cardbus/siisata_cardbus.c:1.15 Mon Aug 1 11:20:28 2011
+++ src/sys/dev/cardbus/siisata_cardbus.c Sun Sep 25 17:33:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata_cardbus.c,v 1.15 2011/08/01 11:20:28 drochner Exp $ */
+/* $NetBSD: siisata_cardbus.c,v 1.16 2022/09/25 17:33:19 thorpej Exp $ */
/* Id: siisata_pci.c,v 1.11 2008/05/21 16:20:11 jakllsch Exp */
/*
@@ -52,10 +52,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siisata_cardbus.c,v 1.15 2011/08/01 11:20:28 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siisata_cardbus.c,v 1.16 2022/09/25 17:33:19 thorpej Exp $");
#include <sys/types.h>
-#include <sys/malloc.h>
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
