Module Name: src
Committed By: thorpej
Date: Fri Nov 20 18:10:07 UTC 2020
Modified Files:
src/sys/arch/arm/gemini: gemini_ipi.c gemini_lpchc.c gemini_pci.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/gemini/gemini_ipi.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/gemini/gemini_lpchc.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/gemini/gemini_pci.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/gemini/gemini_ipi.c
diff -u src/sys/arch/arm/gemini/gemini_ipi.c:1.8 src/sys/arch/arm/gemini/gemini_ipi.c:1.9
--- src/sys/arch/arm/gemini/gemini_ipi.c:1.8 Sun Nov 10 21:16:23 2019
+++ src/sys/arch/arm/gemini/gemini_ipi.c Fri Nov 20 18:10:07 2020
@@ -7,13 +7,13 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_ipi.c,v 1.8 2019/11/10 21:16:23 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_ipi.c,v 1.9 2020/11/20 18:10:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/intr.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <arch/arm/gemini/gemini_obiovar.h>
#include <arch/arm/gemini/gemini_ipivar.h>
#include <arch/arm/gemini/gemini_reg.h>
@@ -103,7 +103,7 @@ gemini_ipi_intrq_insert(gemini_ipi_softc
{
gemini_ipi_intrq_t *iqp;
- iqp = malloc(sizeof(*iqp), M_DEVBUF, M_WAITOK|M_ZERO);
+ iqp = kmem_zalloc(sizeof(*iqp), KM_SLEEP);
iqp->iq_func = func;
iqp->iq_arg = arg;
SIMPLEQ_INSERT_TAIL(&sc->sc_intrq, iqp, iq_q);
@@ -120,7 +120,7 @@ gemini_ipi_intrq_remove(gemini_ipi_softc
if ((void *)iqp == cookie) {
SIMPLEQ_REMOVE(&sc->sc_intrq,
iqp, gemini_ipi_intrq, iq_q);
- free(iqp, M_DEVBUF);
+ kmem_free(iqp, sizeof(*iqp));
return;
}
}
Index: src/sys/arch/arm/gemini/gemini_lpchc.c
diff -u src/sys/arch/arm/gemini/gemini_lpchc.c:1.4 src/sys/arch/arm/gemini/gemini_lpchc.c:1.5
--- src/sys/arch/arm/gemini/gemini_lpchc.c:1.4 Sun Nov 10 21:16:23 2019
+++ src/sys/arch/arm/gemini/gemini_lpchc.c Fri Nov 20 18:10:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_lpchc.c,v 1.4 2019/11/10 21:16:23 chs Exp $ */
+/* $NetBSD: gemini_lpchc.c,v 1.5 2020/11/20 18:10:07 thorpej Exp $ */
/*
* GEMINI LPC Host Controller
@@ -7,7 +7,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_lpchc.c,v 1.4 2019/11/10 21:16:23 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_lpchc.c,v 1.5 2020/11/20 18:10:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -15,7 +15,7 @@ __KERNEL_RCSID(0, "$NetBSD: gemini_lpchc
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/bus.h>
@@ -94,7 +94,7 @@ gemini_lpchc_intrq_insert(gemini_lpchc_s
{
gemini_lpchc_intrq_t *iqp;
- iqp = malloc(sizeof(*iqp), M_DEVBUF, M_WAITOK|M_ZERO);
+ iqp = kmem_zalloc(sizeof(*iqp), KM_SLEEP);
iqp->iq_func = func;
iqp->iq_arg = arg;
iqp->iq_bit = bit;
@@ -113,7 +113,7 @@ gemini_lpchc_intrq_remove(gemini_lpchc_s
if ((void *)iqp == cookie) {
SIMPLEQ_REMOVE(&sc->sc_intrq,
iqp, gemini_lpchc_intrq, iq_q);
- free(iqp, M_DEVBUF);
+ kmem_free(iqp, sizeof(*iqp));
return;
}
}
Index: src/sys/arch/arm/gemini/gemini_pci.c
diff -u src/sys/arch/arm/gemini/gemini_pci.c:1.22 src/sys/arch/arm/gemini/gemini_pci.c:1.23
--- src/sys/arch/arm/gemini/gemini_pci.c:1.22 Tue Jul 7 03:38:45 2020
+++ src/sys/arch/arm/gemini/gemini_pci.c Fri Nov 20 18:10:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_pci.c,v 1.22 2020/07/07 03:38:45 thorpej Exp $ */
+/* $NetBSD: gemini_pci.c,v 1.23 2020/11/20 18:10:07 thorpej Exp $ */
/* adapted from:
* NetBSD: i80312_pci.c,v 1.9 2005/12/11 12:16:51 christos Exp
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_pci.c,v 1.22 2020/07/07 03:38:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_pci.c,v 1.23 2020/11/20 18:10:07 thorpej Exp $");
#include "opt_gemini.h"
#include "opt_pci.h"
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: gemini_pci.c
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/bus.h>
#include <sys/intr.h>
@@ -116,7 +116,7 @@ gemini_pci_intrq_insert(void *ih, int (*
{
struct gemini_pci_intrq *iqp;
- iqp = malloc(sizeof(*iqp), M_DEVBUF, M_WAITOK|M_ZERO);
+ iqp = kmem_zalloc(sizeof(*iqp), KM_SLEEP);
iqp->iq_func = func;
iqp->iq_arg = arg;
iqp->iq_ih = ih;
@@ -134,7 +134,7 @@ gemini_pci_intrq_remove(void *cookie)
if ((void *)iqp == cookie) {
SIMPLEQ_REMOVE(&gemini_pci_intrq,
iqp, gemini_pci_intrq, iq_q);
- free(iqp, M_DEVBUF);
+ kmem_free(iqp, sizeof(*iqp));
return;
}
}
