CVS commit: src/sys/arch/cesfic

[Jason R Thorpe]

Module Name:    src
Committed By:   thorpej
Date:           Wed Nov 18 03:40:50 UTC 2020

Modified Files:
        src/sys/arch/cesfic/cesfic: isr.c
        src/sys/arch/cesfic/dev: zs.c

Log Message:
malloc(9) -> kmem(9)


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/cesfic/cesfic/isr.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/cesfic/dev/zs.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/cesfic/cesfic/isr.c
diff -u src/sys/arch/cesfic/cesfic/isr.c:1.17 src/sys/arch/cesfic/cesfic/isr.c:1.18
--- src/sys/arch/cesfic/cesfic/isr.c:1.17	Sun Nov 10 21:16:25 2019
+++ src/sys/arch/cesfic/cesfic/isr.c	Wed Nov 18 03:40:50 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: isr.c,v 1.17 2019/11/10 21:16:25 chs Exp $	*/
+/*	$NetBSD: isr.c,v 1.18 2020/11/18 03:40:50 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,12 +34,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.17 2019/11/10 21:16:25 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.18 2020/11/18 03:40:50 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/vmmeter.h>
 #include <sys/cpu.h>
 
@@ -76,7 +76,7 @@ isrlink(int (*func)(void *), void *arg, 
 	if ((ipl < 0) || (ipl >= NISR))
 		panic("isrlink: bad ipl %d", ipl);
 
-	newisr = malloc(sizeof(struct isr), M_DEVBUF, M_WAITOK);
+	newisr = kmem_alloc(sizeof(*newisr), KM_SLEEP);
 	newisr->isr_func = func;
 	newisr->isr_arg = arg;
 	newisr->isr_ipl = ipl;
@@ -144,7 +144,7 @@ isrunlink(void *arg)
 	struct isr *isr = arg;
 
 	LIST_REMOVE(isr, isr_link);
-	free(isr, M_DEVBUF);
+	kmem_free(isr, sizeof(*isr));
 }
 #endif
 

Index: src/sys/arch/cesfic/dev/zs.c
diff -u src/sys/arch/cesfic/dev/zs.c:1.20 src/sys/arch/cesfic/dev/zs.c:1.21
--- src/sys/arch/cesfic/dev/zs.c:1.20	Sun Nov 10 21:16:25 2019
+++ src/sys/arch/cesfic/dev/zs.c	Wed Nov 18 03:40:50 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: zs.c,v 1.20 2019/11/10 21:16:25 chs Exp $	*/
+/*	$NetBSD: zs.c,v 1.21 2020/11/18 03:40:50 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.20 2019/11/10 21:16:25 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.21 2020/11/18 03:40:50 thorpej Exp $");
 
 #include "opt_ddb.h"
 
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.20 
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/proc.h>
 #include <sys/tty.h>
 #include <sys/time.h>
@@ -123,8 +123,7 @@ zs_config(struct zsc_softc *zsc, char *b
 		if (zsc_args.hwflags & ZS_HWFLAG_CONSOLE) {
 			cs = &zs_conschan_store;
 		} else {
-			cs = malloc(sizeof(struct zs_chanstate),
-				    M_DEVBUF, M_WAITOK | M_ZERO);
+			cs = kmem_zalloc(sizeof(*cs), KM_SLEEP);
 			if(channel==0){
 				cs->cs_reg_csr  = base + 7;
 				cs->cs_reg_data = base + 15;