Module Name: src
Committed By: thorpej
Date: Sat Nov 21 15:36:36 UTC 2020
Modified Files:
src/sys/arch/evbmips/gdium: gdium_intr.c
src/sys/arch/evbmips/loongson: loongson_intr.c
src/sys/arch/evbmips/malta: malta_intr.c
src/sys/arch/evbmips/malta/pci: pcib.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbmips/gdium/gdium_intr.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/loongson/loongson_intr.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbmips/malta/malta_intr.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbmips/malta/pci/pcib.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/evbmips/gdium/gdium_intr.c
diff -u src/sys/arch/evbmips/gdium/gdium_intr.c:1.9 src/sys/arch/evbmips/gdium/gdium_intr.c:1.10
--- src/sys/arch/evbmips/gdium/gdium_intr.c:1.9 Sun Nov 10 21:16:26 2019
+++ src/sys/arch/evbmips/gdium/gdium_intr.c Sat Nov 21 15:36:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gdium_intr.c,v 1.9 2019/11/10 21:16:26 chs Exp $ */
+/* $NetBSD: gdium_intr.c,v 1.10 2020/11/21 15:36:36 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gdium_intr.c,v 1.9 2019/11/10 21:16:26 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdium_intr.c,v 1.10 2020/11/21 15:36:36 thorpej Exp $");
#define __INTR_PRIVATE
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: gdium_intr.c
#include <sys/device.h>
#include <sys/intr.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/systm.h>
#include <mips/locore.h>
@@ -239,7 +239,7 @@ evbmips_intr_establish(int irq, int (*fu
KASSERT(irq == irqmap->irqidx);
- ih = malloc(sizeof(*ih), M_DEVBUF, M_WAITOK|M_ZERO);
+ ih = kmem_zalloc(sizeof(*ih), KM_SLEEP);
ih->ih_func = func;
ih->ih_arg = arg;
ih->ih_irq = irq;
@@ -290,7 +290,7 @@ evbmips_intr_disestablish(void *cookie)
splx(s);
- free(ih, M_DEVBUF);
+ kmem_free(ih, sizeof(*ih));
}
void
Index: src/sys/arch/evbmips/loongson/loongson_intr.c
diff -u src/sys/arch/evbmips/loongson/loongson_intr.c:1.7 src/sys/arch/evbmips/loongson/loongson_intr.c:1.8
--- src/sys/arch/evbmips/loongson/loongson_intr.c:1.7 Sun Nov 10 21:16:26 2019
+++ src/sys/arch/evbmips/loongson/loongson_intr.c Sat Nov 21 15:36:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: loongson_intr.c,v 1.7 2019/11/10 21:16:26 chs Exp $ */
+/* $NetBSD: loongson_intr.c,v 1.8 2020/11/21 15:36:36 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: loongson_intr.c,v 1.7 2019/11/10 21:16:26 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: loongson_intr.c,v 1.8 2020/11/21 15:36:36 thorpej Exp $");
#define __INTR_PRIVATE
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: loongson_int
#include <sys/cpu.h>
#include <sys/intr.h>
#include <sys/bus.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <mips/mips3_clock.h>
#include <machine/locore.h>
@@ -295,7 +295,7 @@ evbmips_intr_establish(int irq, int (*fu
KASSERT(irq < BONITO_NINTS);
DPRINTF(("loongson_intr_establish %d %p", irq, func));
- ih = malloc(sizeof(*ih), M_DEVBUF, M_WAITOK|M_ZERO);
+ ih = kmem_zalloc(sizeof(*ih), KM_SLEEP);
ih->ih_func = func;
ih->ih_arg = arg;
ih->ih_irq = irq;
@@ -327,7 +327,7 @@ evbmips_intr_disestablish(void *cookie)
!BONITO_IRQ_IS_ISA(ih->ih_irq))
REGVAL(BONITO_INTENCLR) = (1 << ih->ih_irq);
splx(s);
- free(ih, M_DEVBUF);
+ kmem_free(ih, sizeof(*ih));
}
const char *
Index: src/sys/arch/evbmips/malta/malta_intr.c
diff -u src/sys/arch/evbmips/malta/malta_intr.c:1.26 src/sys/arch/evbmips/malta/malta_intr.c:1.27
--- src/sys/arch/evbmips/malta/malta_intr.c:1.26 Sun Nov 10 21:16:26 2019
+++ src/sys/arch/evbmips/malta/malta_intr.c Sat Nov 21 15:36:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: malta_intr.c,v 1.26 2019/11/10 21:16:26 chs Exp $ */
+/* $NetBSD: malta_intr.c,v 1.27 2020/11/21 15:36:36 thorpej Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -40,14 +40,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: malta_intr.c,v 1.26 2019/11/10 21:16:26 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: malta_intr.c,v 1.27 2020/11/21 15:36:36 thorpej Exp $");
#define __INTR_PRIVATE
#include <sys/param.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/systm.h>
#include <sys/cpu.h>
@@ -206,7 +206,7 @@ evbmips_intr_establish(int irq, int (*fu
struct evbmips_intrhand *ih;
int s;
- ih = malloc(sizeof(*ih), M_DEVBUF, M_WAITOK);
+ ih = kmem_alloc(sizeof(*ih), KM_SLEEP);
ih->ih_func = func;
ih->ih_arg = arg;
@@ -241,7 +241,7 @@ evbmips_intr_disestablish(void *arg)
splx(s);
- free(ih, M_DEVBUF);
+ kmem_free(ih, sizeof(*ih));
}
void
Index: src/sys/arch/evbmips/malta/pci/pcib.c
diff -u src/sys/arch/evbmips/malta/pci/pcib.c:1.19 src/sys/arch/evbmips/malta/pci/pcib.c:1.20
--- src/sys/arch/evbmips/malta/pci/pcib.c:1.19 Sun Nov 10 21:16:26 2019
+++ src/sys/arch/evbmips/malta/pci/pcib.c Sat Nov 21 15:36:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.19 2019/11/10 21:16:26 chs Exp $ */
+/* $NetBSD: pcib.c,v 1.20 2020/11/21 15:36:36 thorpej Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,13 +36,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.19 2019/11/10 21:16:26 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.20 2020/11/21 15:36:36 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <uvm/uvm_extern.h>
@@ -508,7 +508,7 @@ pcib_isa_intr_establish(void *v, int irq
return (NULL);
}
- ih = malloc(sizeof(*ih), M_DEVBUF, M_WAITOK);
+ ih = kmem_alloc(sizeof(*ih), KM_SLEEP);
ih->ih_func = func;
ih->ih_arg = arg;
ih->ih_irq = irq;
@@ -551,7 +551,7 @@ pcib_isa_intr_disestablish(void *v, void
splx(s);
- free(ih, M_DEVBUF);
+ kmem_free(ih, sizeof(*ih));
}
static int
