Module Name: src
Committed By: thorpej
Date: Fri Nov 20 18:26:26 UTC 2020
Modified Files:
src/sys/arch/arm/ixp12x0: ixp12x0_com.c ixp12x0_intr.c
src/sys/arch/arm/marvell: mvsoc_sdhc.c
src/sys/arch/arm/ofw: ofw_irqhandler.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/arm/ixp12x0/ixp12x0_com.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/ixp12x0/ixp12x0_intr.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/marvell/mvsoc_sdhc.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/ofw/ofw_irqhandler.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/arm/ixp12x0/ixp12x0_com.c
diff -u src/sys/arch/arm/ixp12x0/ixp12x0_com.c:1.48 src/sys/arch/arm/ixp12x0/ixp12x0_com.c:1.49
--- src/sys/arch/arm/ixp12x0/ixp12x0_com.c:1.48 Sun Nov 10 21:16:24 2019
+++ src/sys/arch/arm/ixp12x0/ixp12x0_com.c Fri Nov 20 18:26:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0_com.c,v 1.48 2019/11/10 21:16:24 chs Exp $ */
+/* $NetBSD: ixp12x0_com.c,v 1.49 2020/11/20 18:26:26 thorpej Exp $ */
/*
* Copyright (c) 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.c,v 1.48 2019/11/10 21:16:24 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.c,v 1.49 2020/11/20 18:26:26 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -82,7 +82,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.
#include <sys/file.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/tty.h>
#include <sys/uio.h>
#include <sys/vnode.h>
@@ -212,7 +212,7 @@ ixpcom_attach_subr(struct ixpcom_softc *
tp->t_hwiflow = ixpcomhwiflow;
sc->sc_tty = tp;
- sc->sc_rbuf = malloc(IXPCOM_RING_SIZE << 1, M_DEVBUF, M_WAITOK);
+ sc->sc_rbuf = kmem_alloc(IXPCOM_RING_SIZE << 1, KM_SLEEP);
sc->sc_rbput = sc->sc_rbget = sc->sc_rbuf;
sc->sc_rbavail = IXPCOM_RING_SIZE;
sc->sc_ebuf = sc->sc_rbuf + (IXPCOM_RING_SIZE << 1);
Index: src/sys/arch/arm/ixp12x0/ixp12x0_intr.c
diff -u src/sys/arch/arm/ixp12x0/ixp12x0_intr.c:1.32 src/sys/arch/arm/ixp12x0/ixp12x0_intr.c:1.33
--- src/sys/arch/arm/ixp12x0/ixp12x0_intr.c:1.32 Sun Nov 10 21:16:24 2019
+++ src/sys/arch/arm/ixp12x0/ixp12x0_intr.c Fri Nov 20 18:26:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0_intr.c,v 1.32 2019/11/10 21:16:24 chs Exp $ */
+/* $NetBSD: ixp12x0_intr.c,v 1.33 2020/11/20 18:26:26 thorpej Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_intr.c,v 1.32 2019/11/10 21:16:24 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_intr.c,v 1.33 2020/11/20 18:26:26 thorpej Exp $");
/*
* Interrupt support for the Intel ixp12x0
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp12x0_intr
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/termios.h>
#include <sys/bus.h>
#include <sys/intr.h>
@@ -342,7 +342,7 @@ ixp12x0_intr_establish(int irq, int ipl,
if (ipl < 0 || ipl > NIPL)
panic("ixp12x0_intr_establish: IPL %d out of range", ipl);
- ih = malloc(sizeof(*ih), M_DEVBUF, M_WAITOK);
+ ih = kmem_alloc(sizeof(*ih), KM_SLEEP);
ih->ih_func = ih_func;
ih->ih_arg = arg;
ih->ih_irq = irq;
Index: src/sys/arch/arm/marvell/mvsoc_sdhc.c
diff -u src/sys/arch/arm/marvell/mvsoc_sdhc.c:1.1 src/sys/arch/arm/marvell/mvsoc_sdhc.c:1.2
--- src/sys/arch/arm/marvell/mvsoc_sdhc.c:1.1 Sat Jan 7 16:19:28 2017
+++ src/sys/arch/arm/marvell/mvsoc_sdhc.c Fri Nov 20 18:26:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsoc_sdhc.c,v 1.1 2017/01/07 16:19:28 kiyohara Exp $ */
+/* $NetBSD: mvsoc_sdhc.c,v 1.2 2020/11/20 18:26:26 thorpej Exp $ */
/*
* Copyright (c) 2016 KIYOHARA Takashi
* All rights reserved.
@@ -26,13 +26,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsoc_sdhc.c,v 1.1 2017/01/07 16:19:28 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsoc_sdhc.c,v 1.2 2020/11/20 18:26:26 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/device.h>
#include <sys/errno.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/systm.h>
#include <dev/marvell/marvellreg.h>
@@ -75,7 +75,7 @@ mvsoc_sdhc_attach(device_t parent, devic
int error;
sc->sc_dev = self;
- sc->sc_host = malloc(sizeof(*sc->sc_host), M_DEVBUF, M_WAITOK | M_ZERO);
+ sc->sc_host = kmem_zalloc(sizeof(*sc->sc_host), KM_SLEEP);
sc->sc_dmat = mva->mva_dmat;
/* Must require the DMA. This sdhc can't 32bit access to SDHC_DATA. */
sc->sc_flags = SDHC_FLAG_USE_DMA;
Index: src/sys/arch/arm/ofw/ofw_irqhandler.c
diff -u src/sys/arch/arm/ofw/ofw_irqhandler.c:1.22 src/sys/arch/arm/ofw/ofw_irqhandler.c:1.23
--- src/sys/arch/arm/ofw/ofw_irqhandler.c:1.22 Sun Nov 10 21:16:24 2019
+++ src/sys/arch/arm/ofw/ofw_irqhandler.c Fri Nov 20 18:26:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_irqhandler.c,v 1.22 2019/11/10 21:16:24 chs Exp $ */
+/* $NetBSD: ofw_irqhandler.c,v 1.23 2020/11/20 18:26:26 thorpej Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,12 +42,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_irqhandler.c,v 1.22 2019/11/10 21:16:24 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_irqhandler.c,v 1.23 2020/11/20 18:26:26 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/syslog.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/intr.h>
#include <machine/irqhandler.h>
@@ -292,14 +292,14 @@ intr_claim(int irq, int level, int (*ih_
{
irqhandler_t *ih;
- ih = malloc(sizeof(*ih), M_DEVBUF, M_WAITOK|M_ZERO);
+ ih = kmem_zalloc(sizeof(*ih), KM_SLEEP);
ih->ih_level = level;
ih->ih_func = ih_func;
ih->ih_arg = ih_arg;
ih->ih_flags = 0;
if (irq_claim(irq, ih, group, name) != 0) {
- free(ih, M_DEVBUF);
+ kmem_free(ih, sizeof(*ih));
return(NULL);
}
return(ih);
@@ -312,7 +312,7 @@ intr_release(void *arg)
irqhandler_t *ih = (irqhandler_t *)arg;
if (irq_release(ih->ih_num, ih) == 0) {
- free(ih, M_DEVBUF);
+ kmem_free(ih, sizeof(*ih));
return(0);
}
return(1);
