Module Name: src
Committed By: thorpej
Date: Sat Nov 14 02:23:04 UTC 2020
Modified Files:
src/sys/arch/algor/algor: algor_p4032_intr.c algor_p5064_intr.c
algor_p6032_intr.c
src/sys/arch/algor/pci: pcib.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/algor/algor/algor_p4032_intr.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/algor/algor/algor_p5064_intr.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/algor/algor/algor_p6032_intr.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/algor/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/algor/algor/algor_p4032_intr.c
diff -u src/sys/arch/algor/algor/algor_p4032_intr.c:1.26 src/sys/arch/algor/algor/algor_p4032_intr.c:1.27
--- src/sys/arch/algor/algor/algor_p4032_intr.c:1.26 Sun Nov 10 21:16:21 2019
+++ src/sys/arch/algor/algor/algor_p4032_intr.c Sat Nov 14 02:23:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p4032_intr.c,v 1.26 2019/11/10 21:16:21 chs Exp $ */
+/* $NetBSD: algor_p4032_intr.c,v 1.27 2020/11/14 02:23:04 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p4032_intr.c,v 1.26 2019/11/10 21:16:21 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p4032_intr.c,v 1.27 2020/11/14 02:23:04 thorpej Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: algor_p4032_
#include <sys/device.h>
#include <sys/intr.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/queue.h>
#include <sys/systm.h>
@@ -352,7 +352,7 @@ algor_p4032_intr_establish(int irq, int
KASSERT(irq == irqmap->irqidx);
- 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 = 0;
@@ -408,7 +408,7 @@ algor_p4032_intr_disestablish(void *cook
splx(s);
- free(ih, M_DEVBUF);
+ kmem_free(ih, sizeof(*ih));
}
void
Index: src/sys/arch/algor/algor/algor_p5064_intr.c
diff -u src/sys/arch/algor/algor/algor_p5064_intr.c:1.29 src/sys/arch/algor/algor/algor_p5064_intr.c:1.30
--- src/sys/arch/algor/algor/algor_p5064_intr.c:1.29 Sun Nov 10 21:16:21 2019
+++ src/sys/arch/algor/algor/algor_p5064_intr.c Sat Nov 14 02:23:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p5064_intr.c,v 1.29 2019/11/10 21:16:21 chs Exp $ */
+/* $NetBSD: algor_p5064_intr.c,v 1.30 2020/11/14 02:23:04 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p5064_intr.c,v 1.29 2019/11/10 21:16:21 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p5064_intr.c,v 1.30 2020/11/14 02:23:04 thorpej Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: algor_p5064_
#include <sys/device.h>
#include <sys/intr.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/queue.h>
#include <sys/systm.h>
@@ -445,7 +445,7 @@ algor_p5064_intr_establish(int irq, int
KASSERT(irq == irqmap->irqidx);
- 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 = 0;
@@ -501,7 +501,7 @@ algor_p5064_intr_disestablish(void *cook
splx(s);
- free(ih, M_DEVBUF);
+ kmem_free(ih, sizeof(*ih));
}
void
Index: src/sys/arch/algor/algor/algor_p6032_intr.c
diff -u src/sys/arch/algor/algor/algor_p6032_intr.c:1.23 src/sys/arch/algor/algor/algor_p6032_intr.c:1.24
--- src/sys/arch/algor/algor/algor_p6032_intr.c:1.23 Sun Nov 10 21:16:21 2019
+++ src/sys/arch/algor/algor/algor_p6032_intr.c Sat Nov 14 02:23:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p6032_intr.c,v 1.23 2019/11/10 21:16:21 chs Exp $ */
+/* $NetBSD: algor_p6032_intr.c,v 1.24 2020/11/14 02:23:04 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: algor_p6032_intr.c,v 1.23 2019/11/10 21:16:21 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: algor_p6032_intr.c,v 1.24 2020/11/14 02:23:04 thorpej Exp $");
#include "opt_ddb.h"
#define __INTR_PRIVATE
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: algor_p6032_
#include <sys/device.h>
#include <sys/intr.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/queue.h>
#include <sys/systm.h>
@@ -313,7 +313,7 @@ algor_p6032_intr_establish(int irq, int
KASSERT(irq == irqmap->irqidx);
- 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 = 0;
@@ -365,7 +365,7 @@ algor_p6032_intr_disestablish(void *cook
splx(s);
- free(ih, M_DEVBUF);
+ kmem_free(ih, sizeof(*ih));
}
void
Index: src/sys/arch/algor/pci/pcib.c
diff -u src/sys/arch/algor/pci/pcib.c:1.25 src/sys/arch/algor/pci/pcib.c:1.26
--- src/sys/arch/algor/pci/pcib.c:1.25 Sun Nov 10 21:16:22 2019
+++ src/sys/arch/algor/pci/pcib.c Sat Nov 14 02:23:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.25 2019/11/10 21:16:22 chs Exp $ */
+/* $NetBSD: pcib.c,v 1.26 2020/11/14 02:23:04 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.25 2019/11/10 21:16:22 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.26 2020/11/14 02:23:04 thorpej Exp $");
#include "opt_algor_p5064.h"
#include "opt_algor_p6032.h"
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.2
#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 <algor/autoconf.h>
@@ -449,7 +449,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;
@@ -501,7 +501,7 @@ pcib_isa_intr_disestablish(void *v, void
splx(s);
- free(ih, M_DEVBUF);
+ kmem_free(ih, sizeof(*ih));
}
int
