Module Name: src
Committed By: thorpej
Date: Sat Nov 21 15:30:07 UTC 2020
Modified Files:
src/sys/arch/evbarm/ifpga: ifpga_intr.c
src/sys/arch/evbarm/iq80310: iq80310_intr.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/ifpga/ifpga_intr.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/iq80310/iq80310_intr.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/evbarm/ifpga/ifpga_intr.c
diff -u src/sys/arch/evbarm/ifpga/ifpga_intr.c:1.11 src/sys/arch/evbarm/ifpga/ifpga_intr.c:1.12
--- src/sys/arch/evbarm/ifpga/ifpga_intr.c:1.11 Sun Nov 10 21:16:25 2019
+++ src/sys/arch/evbarm/ifpga/ifpga_intr.c Sat Nov 21 15:30:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ifpga_intr.c,v 1.11 2019/11/10 21:16:25 chs Exp $ */
+/* $NetBSD: ifpga_intr.c,v 1.12 2020/11/21 15:30:06 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -45,7 +45,7 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/bus.h>
#include <sys/intr.h>
@@ -255,7 +255,7 @@ ifpga_intr_establish(int irq, int ipl, i
if (irq < 0 || irq > NIRQ)
panic("ifpga_intr_establish: IRQ %d out of range", irq);
- 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_ipl = ipl;
Index: src/sys/arch/evbarm/iq80310/iq80310_intr.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_intr.c:1.35 src/sys/arch/evbarm/iq80310/iq80310_intr.c:1.36
--- src/sys/arch/evbarm/iq80310/iq80310_intr.c:1.35 Sun Nov 10 21:16:26 2019
+++ src/sys/arch/evbarm/iq80310/iq80310_intr.c Sat Nov 21 15:30:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_intr.c,v 1.35 2019/11/10 21:16:26 chs Exp $ */
+/* $NetBSD: iq80310_intr.c,v 1.36 2020/11/21 15:30:07 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_intr.c,v 1.35 2019/11/10 21:16:26 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_intr.c,v 1.36 2020/11/21 15:30:07 thorpej Exp $");
#ifndef EVBARM_SPL_NOINLINE
#define EVBARM_SPL_NOINLINE
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: iq80310_intr
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/bus.h>
#include <machine/intr.h>
@@ -373,7 +373,7 @@ iq80310_intr_establish(int irq, int ipl,
if (irq < 0 || irq > NIRQ)
panic("iq80310_intr_establish: IRQ %d out of range", irq);
- 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_ipl = ipl;
