Module Name: src
Committed By: thorpej
Date: Sat Nov 21 17:18:31 UTC 2020
Modified Files:
src/sys/arch/sgimips/dev: int.c zs_kbd.c
src/sys/arch/sgimips/gio: grtwo.c light.c newport.c
src/sys/arch/sgimips/hpc: pckbc_hpc.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sgimips/dev/int.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sgimips/dev/zs_kbd.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sgimips/gio/grtwo.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sgimips/gio/light.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sgimips/gio/newport.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sgimips/hpc/pckbc_hpc.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/sgimips/dev/int.c
diff -u src/sys/arch/sgimips/dev/int.c:1.31 src/sys/arch/sgimips/dev/int.c:1.32
--- src/sys/arch/sgimips/dev/int.c:1.31 Fri May 29 12:30:40 2020
+++ src/sys/arch/sgimips/dev/int.c Sat Nov 21 17:18:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: int.c,v 1.31 2020/05/29 12:30:40 rin Exp $ */
+/* $NetBSD: int.c,v 1.32 2020/11/21 17:18:31 thorpej Exp $ */
/*
* Copyright (c) 2009 Stephen M. Rumble
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: int.c,v 1.31 2020/05/29 12:30:40 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: int.c,v 1.32 2020/11/21 17:18:31 thorpej Exp $");
#define __INTR_PRIVATE
#include "opt_cputype.h"
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: int.c,v 1.31
#include <sys/timetc.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <dev/ic/i8253reg.h>
#include <machine/sysconf.h>
@@ -368,7 +368,7 @@ int1_intr_establish(int level, int ipl,
} else {
struct sgimips_intrhand *n, *ih;
- ih = malloc(sizeof *ih, M_DEVBUF, M_WAITOK);
+ ih = kmem_alloc(sizeof *ih, KM_SLEEP);
ih->ih_fun = handler;
ih->ih_arg = arg;
ih->ih_next = NULL;
@@ -407,7 +407,7 @@ int2_intr_establish(int level, int ipl,
} else {
struct sgimips_intrhand *n, *ih;
- ih = malloc(sizeof *ih, M_DEVBUF, M_WAITOK);
+ ih = kmem_alloc(sizeof *ih, KM_SLEEP);
ih->ih_fun = handler;
ih->ih_arg = arg;
ih->ih_next = NULL;
Index: src/sys/arch/sgimips/dev/zs_kbd.c
diff -u src/sys/arch/sgimips/dev/zs_kbd.c:1.10 src/sys/arch/sgimips/dev/zs_kbd.c:1.11
--- src/sys/arch/sgimips/dev/zs_kbd.c:1.10 Mon Oct 29 12:51:38 2012
+++ src/sys/arch/sgimips/dev/zs_kbd.c Sat Nov 21 17:18:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_kbd.c,v 1.10 2012/10/29 12:51:38 chs Exp $ */
+/* $NetBSD: zs_kbd.c,v 1.11 2020/11/21 17:18:31 thorpej Exp $ */
/*
* Copyright (c) 2004 Steve Rumble
@@ -33,10 +33,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_kbd.c,v 1.10 2012/10/29 12:51:38 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_kbd.c,v 1.11 2020/11/21 17:18:31 thorpej Exp $");
#include <sys/param.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/device.h>
@@ -213,10 +213,8 @@ zskbd_attach(device_t parent, device_t s
} else {
wskaa.console = 0;
- sc->sc_dc = malloc(sizeof(struct zskbd_devconfig), M_DEVBUF,
- M_WAITOK);
- if (sc->sc_dc == NULL)
- panic("zskbd out of memory");
+ sc->sc_dc = kmem_alloc(sizeof(struct zskbd_devconfig),
+ KM_SLEEP);
sc->sc_dc->enabled = 0;
}
Index: src/sys/arch/sgimips/gio/grtwo.c
diff -u src/sys/arch/sgimips/gio/grtwo.c:1.15 src/sys/arch/sgimips/gio/grtwo.c:1.16
--- src/sys/arch/sgimips/gio/grtwo.c:1.15 Mon Sep 3 16:29:27 2018
+++ src/sys/arch/sgimips/gio/grtwo.c Sat Nov 21 17:18:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: grtwo.c,v 1.15 2018/09/03 16:29:27 riastradh Exp $ */
+/* $NetBSD: grtwo.c,v 1.16 2020/11/21 17:18:31 thorpej Exp $ */
/*
* Copyright (c) 2004 Christopher SEKIYA
@@ -35,12 +35,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grtwo.c,v 1.15 2018/09/03 16:29:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grtwo.c,v 1.16 2020/11/21 17:18:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <machine/sysconf.h>
@@ -507,10 +507,8 @@ grtwo_attach(device_t parent, device_t s
sc->sc_dc = &grtwo_console_dc;
} else {
wa.console = 0;
- sc->sc_dc = malloc(sizeof(struct grtwo_devconfig),
- M_DEVBUF, M_WAITOK | M_ZERO);
- if (sc->sc_dc == NULL)
- panic("grtwo_attach: out of memory");
+ sc->sc_dc = kmem_zalloc(sizeof(struct grtwo_devconfig),
+ KM_SLEEP);
grtwo_attach_common(sc->sc_dc, ga);
}
Index: src/sys/arch/sgimips/gio/light.c
diff -u src/sys/arch/sgimips/gio/light.c:1.7 src/sys/arch/sgimips/gio/light.c:1.8
--- src/sys/arch/sgimips/gio/light.c:1.7 Sat Oct 27 17:18:09 2012
+++ src/sys/arch/sgimips/gio/light.c Sat Nov 21 17:18:31 2020
@@ -1,4 +1,4 @@
-/* $Id: light.c,v 1.7 2012/10/27 17:18:09 chs Exp $ */
+/* $Id: light.c,v 1.8 2020/11/21 17:18:31 thorpej Exp $ */
/*
* Copyright (c) 2006 Stephen M. Rumble
@@ -43,12 +43,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: light.c,v 1.7 2012/10/27 17:18:09 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: light.c,v 1.8 2020/11/21 17:18:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <machine/sysconf.h>
@@ -320,10 +320,8 @@ light_attach(device_t parent, device_t s
sc->sc_dc = &light_console_dc;
} else {
wa.console = 0;
- sc->sc_dc = malloc(sizeof(struct light_devconfig), M_DEVBUF,
- M_WAITOK | M_ZERO);
- if (sc->sc_dc == NULL)
- panic("light_attach: out of memory");
+ sc->sc_dc = kmem_zalloc(sizeof(struct light_devconfig),
+ KM_SLEEP);
light_attach_common(sc->sc_dc, ga);
}
Index: src/sys/arch/sgimips/gio/newport.c
diff -u src/sys/arch/sgimips/gio/newport.c:1.20 src/sys/arch/sgimips/gio/newport.c:1.21
--- src/sys/arch/sgimips/gio/newport.c:1.20 Fri May 10 23:21:42 2019
+++ src/sys/arch/sgimips/gio/newport.c Sat Nov 21 17:18:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: newport.c,v 1.20 2019/05/10 23:21:42 macallan Exp $ */
+/* $NetBSD: newport.c,v 1.21 2020/11/21 17:18:31 thorpej Exp $ */
/*
* Copyright (c) 2003 Ilpo Ruotsalainen
@@ -31,12 +31,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: newport.c,v 1.20 2019/05/10 23:21:42 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: newport.c,v 1.21 2020/11/21 17:18:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <machine/sysconf.h>
@@ -613,10 +613,8 @@ newport_attach(device_t parent, device_t
sc->sc_dc = &newport_console_dc;
} else {
wa.console = 0;
- sc->sc_dc = malloc(sizeof(struct newport_devconfig),
- M_DEVBUF, M_WAITOK | M_ZERO);
- if (sc->sc_dc == NULL)
- panic("newport_attach: out of memory");
+ sc->sc_dc = kmem_zalloc(sizeof(struct newport_devconfig),
+ KM_SLEEP);
newport_attach_common(sc->sc_dc, ga);
}
Index: src/sys/arch/sgimips/hpc/pckbc_hpc.c
diff -u src/sys/arch/sgimips/hpc/pckbc_hpc.c:1.10 src/sys/arch/sgimips/hpc/pckbc_hpc.c:1.11
--- src/sys/arch/sgimips/hpc/pckbc_hpc.c:1.10 Wed Feb 18 16:47:58 2015
+++ src/sys/arch/sgimips/hpc/pckbc_hpc.c Sat Nov 21 17:18:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_hpc.c,v 1.10 2015/02/18 16:47:58 macallan Exp $ */
+/* $NetBSD: pckbc_hpc.c,v 1.11 2020/11/21 17:18:31 thorpej Exp $ */
/*
* Copyright (c) 2003 Christopher SEKIYA
@@ -33,14 +33,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_hpc.c,v 1.10 2015/02/18 16:47:58 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_hpc.c,v 1.11 2020/11/21 17:18:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/errno.h>
#include <sys/queue.h>
#include <sys/bus.h>
@@ -109,8 +109,7 @@ pckbc_hpc_attach(device_t parent, device
haa->ha_devoff + KBCMDP, 1, &ioh_c))
panic("pckbc_hpc_attach: couldn't map");
- t = malloc(sizeof(struct pckbc_internal), M_DEVBUF,
- M_WAITOK | M_ZERO);
+ t = kmem_zalloc(sizeof(struct pckbc_internal), KM_SLEEP);
t->t_iot = hpc_memt;
t->t_ioh_d = ioh_d;
t->t_ioh_c = ioh_c;
