Module Name: src
Committed By: thorpej
Date: Mon Jan 4 17:22:59 UTC 2021
Modified Files:
src/sys/arch/mips/cavium/dev: octeon_asx.c octeon_fpa.c octeon_gmx.c
octeon_ipd.c octeon_pip.c octeon_pko.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/cavium/dev/octeon_asx.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/cavium/dev/octeon_fpa.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mips/cavium/dev/octeon_gmx.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/cavium/dev/octeon_ipd.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/cavium/dev/octeon_pip.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/cavium/dev/octeon_pko.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/mips/cavium/dev/octeon_asx.c
diff -u src/sys/arch/mips/cavium/dev/octeon_asx.c:1.4 src/sys/arch/mips/cavium/dev/octeon_asx.c:1.5
--- src/sys/arch/mips/cavium/dev/octeon_asx.c:1.4 Tue Jun 23 05:14:18 2020
+++ src/sys/arch/mips/cavium/dev/octeon_asx.c Mon Jan 4 17:22:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_asx.c,v 1.4 2020/06/23 05:14:18 simonb Exp $ */
+/* $NetBSD: octeon_asx.c,v 1.5 2021/01/04 17:22:59 thorpej Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -27,11 +27,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_asx.c,v 1.4 2020/06/23 05:14:18 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_asx.c,v 1.5 2021/01/04 17:22:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <mips/cavium/octeonvar.h>
#include <mips/cavium/dev/octeon_asxreg.h>
#include <mips/cavium/dev/octeon_asxvar.h>
@@ -43,7 +43,7 @@ octasx_init(struct octasx_attach_args *a
struct octasx_softc *sc;
int status;
- sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO);
+ sc = kmem_zalloc(sizeof(*sc), KM_SLEEP);
if (sc == NULL)
panic("can't allocate memory: %s", __func__);
Index: src/sys/arch/mips/cavium/dev/octeon_fpa.c
diff -u src/sys/arch/mips/cavium/dev/octeon_fpa.c:1.8 src/sys/arch/mips/cavium/dev/octeon_fpa.c:1.9
--- src/sys/arch/mips/cavium/dev/octeon_fpa.c:1.8 Tue Jun 23 05:14:18 2020
+++ src/sys/arch/mips/cavium/dev/octeon_fpa.c Mon Jan 4 17:22:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_fpa.c,v 1.8 2020/06/23 05:14:18 simonb Exp $ */
+/* $NetBSD: octeon_fpa.c,v 1.9 2021/01/04 17:22:59 thorpej Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -29,12 +29,12 @@
#undef FPADEBUG
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_fpa.c,v 1.8 2020/06/23 05:14:18 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_fpa.c,v 1.9 2021/01/04 17:22:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/types.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/bus.h>
#include <machine/locore.h>
@@ -113,10 +113,8 @@ octfpa_buf_init(int poolno, size_t size,
paddr_t paddr;
nsegs = 1/* XXX */;
- fb = malloc(sizeof(*fb) + sizeof(*fb->fb_dma_segs) * nsegs, M_DEVBUF,
- M_WAITOK | M_ZERO);
- if (fb == NULL)
- return 1;
+ fb = kmem_zalloc(sizeof(*fb) + sizeof(*fb->fb_dma_segs) * nsegs,
+ KM_SLEEP);
fb->fb_poolno = poolno;
fb->fb_size = size;
fb->fb_nelems = nelems;
Index: src/sys/arch/mips/cavium/dev/octeon_gmx.c
diff -u src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.15 src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.16
--- src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.15 Tue Jun 23 05:17:13 2020
+++ src/sys/arch/mips/cavium/dev/octeon_gmx.c Mon Jan 4 17:22:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_gmx.c,v 1.15 2020/06/23 05:17:13 simonb Exp $ */
+/* $NetBSD: octeon_gmx.c,v 1.16 2021/01/04 17:22:59 thorpej Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.15 2020/06/23 05:17:13 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.16 2021/01/04 17:22:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c
#include <sys/device.h>
#include <sys/lock.h>
#include <sys/cdefs.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/syslog.h>
#include <mips/locore.h>
@@ -218,8 +218,8 @@ octgmx_attach(device_t parent, device_t
octgmx_init(sc);
- sc->sc_ports = malloc(sizeof(*sc->sc_ports) * sc->sc_nports, M_DEVBUF,
- M_WAITOK | M_ZERO);
+ sc->sc_ports = kmem_zalloc(sizeof(*sc->sc_ports) * sc->sc_nports,
+ KM_SLEEP);
for (i = 0; i < sc->sc_nports; i++) {
port = GMX_PORT_NUM(sc->sc_unitno, i);
Index: src/sys/arch/mips/cavium/dev/octeon_ipd.c
diff -u src/sys/arch/mips/cavium/dev/octeon_ipd.c:1.7 src/sys/arch/mips/cavium/dev/octeon_ipd.c:1.8
--- src/sys/arch/mips/cavium/dev/octeon_ipd.c:1.7 Tue Jun 23 05:15:33 2020
+++ src/sys/arch/mips/cavium/dev/octeon_ipd.c Mon Jan 4 17:22:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_ipd.c,v 1.7 2020/06/23 05:15:33 simonb Exp $ */
+/* $NetBSD: octeon_ipd.c,v 1.8 2021/01/04 17:22:59 thorpej Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -27,11 +27,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_ipd.c,v 1.7 2020/06/23 05:15:33 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_ipd.c,v 1.8 2021/01/04 17:22:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/mbuf.h>
#include <mips/locore.h>
#include <mips/cavium/octeonvar.h>
@@ -56,10 +56,7 @@ octipd_init(struct octipd_attach_args *a
struct octipd_softc *sc;
int status;
- sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO);
- if (sc == NULL)
- panic("can't allocate memory: %s", __func__);
-
+ sc = kmem_zalloc(sizeof(*sc), KM_SLEEP);
sc->sc_port = aa->aa_port;
sc->sc_regt = aa->aa_regt;
sc->sc_first_mbuff_skip = aa->aa_first_mbuff_skip;
Index: src/sys/arch/mips/cavium/dev/octeon_pip.c
diff -u src/sys/arch/mips/cavium/dev/octeon_pip.c:1.9 src/sys/arch/mips/cavium/dev/octeon_pip.c:1.10
--- src/sys/arch/mips/cavium/dev/octeon_pip.c:1.9 Thu Jul 16 11:49:37 2020
+++ src/sys/arch/mips/cavium/dev/octeon_pip.c Mon Jan 4 17:22:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_pip.c,v 1.9 2020/07/16 11:49:37 jmcneill Exp $ */
+/* $NetBSD: octeon_pip.c,v 1.10 2021/01/04 17:22:59 thorpej Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -27,11 +27,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_pip.c,v 1.9 2020/07/16 11:49:37 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_pip.c,v 1.10 2021/01/04 17:22:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/syslog.h>
#include <sys/time.h>
#include <net/if.h>
@@ -177,10 +177,7 @@ octpip_init(struct octpip_attach_args *a
struct octpip_softc *sc;
int status;
- sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO);
- if (sc == NULL)
- panic("can't allocate memory: %s", __func__);
-
+ sc = kmem_zalloc(sizeof(*sc), KM_SLEEP);
sc->sc_port = aa->aa_port;
sc->sc_regt = aa->aa_regt;
sc->sc_tag_type = aa->aa_tag_type;
Index: src/sys/arch/mips/cavium/dev/octeon_pko.c
diff -u src/sys/arch/mips/cavium/dev/octeon_pko.c:1.5 src/sys/arch/mips/cavium/dev/octeon_pko.c:1.6
--- src/sys/arch/mips/cavium/dev/octeon_pko.c:1.5 Tue Jun 23 05:15:33 2020
+++ src/sys/arch/mips/cavium/dev/octeon_pko.c Mon Jan 4 17:22:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_pko.c,v 1.5 2020/06/23 05:15:33 simonb Exp $ */
+/* $NetBSD: octeon_pko.c,v 1.6 2021/01/04 17:22:59 thorpej Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -27,11 +27,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_pko.c,v 1.5 2020/06/23 05:15:33 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_pko.c,v 1.6 2021/01/04 17:22:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <mips/locore.h>
#include <mips/cavium/octeonvar.h>
#include <mips/cavium/dev/octeon_faureg.h>
@@ -56,10 +56,7 @@ octpko_init(struct octpko_attach_args *a
struct octpko_softc *sc;
int status;
- sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO);
- if (sc == NULL)
- panic("can't allocate memory: %s", __func__);
-
+ sc = kmem_zalloc(sizeof(*sc), KM_SLEEP);
sc->sc_port = aa->aa_port;
sc->sc_regt = aa->aa_regt;
sc->sc_cmdptr = aa->aa_cmdptr;
