diff options
| author | thorpej <thorpej@NetBSD.org> | 2022-09-25 17:20:03 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 2022-09-25 17:20:03 +0000 |
| commit | bcb6c9c70c8dfeed40a3b68c85cf605e0341f086 (patch) | |
| tree | ac967bd26881e12be4cf349cd3d0a6da0fee5e56 /sys/dev | |
| parent | 0e430c51d55274be98a25035c34d322189ba65f5 (diff) | |
Incremental malloc(9) -> kmem(9)
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/isapnp/isapnp.c | 8 | ||||
| -rw-r--r-- | sys/dev/isapnp/isapnpvar.h | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/isapnp/isapnp.c b/sys/dev/isapnp/isapnp.c index 7ad11e1c3c4..cd48c276e8b 100644 --- a/sys/dev/isapnp/isapnp.c +++ b/sys/dev/isapnp/isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: isapnp.c,v 1.62 2021/08/07 16:19:12 thorpej Exp $ */ +/* $NetBSD: isapnp.c,v 1.63 2022/09/25 17:20:03 thorpej Exp $ */ /*- * Copyright (c) 1996, 2008 The NetBSD Foundation, Inc. @@ -34,14 +34,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isapnp.c,v 1.62 2021/08/07 16:19:12 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isapnp.c,v 1.63 2022/09/25 17:20:03 thorpej Exp $"); #include "isadma.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/malloc.h> +#include <sys/kmem.h> #include <sys/bus.h> @@ -862,7 +862,7 @@ isapnp_match(device_t parent, cfdata_t match, void *aux) if (ipc->ipc_parent == parent) return (0); - ipc = malloc(sizeof(*ipc), M_DEVBUF, M_WAITOK); + ipc = kmem_alloc(sizeof(*ipc), KM_SLEEP); ipc->ipc_parent = parent; LIST_INSERT_HEAD(&isapnp_probes, ipc, ipc_link); diff --git a/sys/dev/isapnp/isapnpvar.h b/sys/dev/isapnp/isapnpvar.h index 11b00296343..50fc6e7cb58 100644 --- a/sys/dev/isapnp/isapnpvar.h +++ b/sys/dev/isapnp/isapnpvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: isapnpvar.h,v 1.28 2009/03/15 15:45:48 cegger Exp $ */ +/* $NetBSD: isapnpvar.h,v 1.29 2022/09/25 17:20:03 thorpej Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -62,6 +62,8 @@ struct isapnp_softc; #else +# include <sys/malloc.h> + # define ISAPNP_WRITE_ADDR(sc, v) \ bus_space_write_1(sc->sc_iot, sc->sc_addr_ioh, 0, v) # define ISAPNP_WRITE_DATA(sc, v) \ |
