Module Name: src
Committed By: thorpej
Date: Sun Sep 25 17:20:03 UTC 2022
Modified Files:
src/sys/dev/isapnp: isapnp.c isapnpvar.h
Log Message:
Incremental malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/isapnp/isapnp.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/isapnp/isapnpvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/isapnp/isapnp.c
diff -u src/sys/dev/isapnp/isapnp.c:1.62 src/sys/dev/isapnp/isapnp.c:1.63
--- src/sys/dev/isapnp/isapnp.c:1.62 Sat Aug 7 16:19:12 2021
+++ src/sys/dev/isapnp/isapnp.c Sun Sep 25 17:20:03 2022
@@ -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 m
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);
Index: src/sys/dev/isapnp/isapnpvar.h
diff -u src/sys/dev/isapnp/isapnpvar.h:1.28 src/sys/dev/isapnp/isapnpvar.h:1.29
--- src/sys/dev/isapnp/isapnpvar.h:1.28 Sun Mar 15 15:45:48 2009
+++ src/sys/dev/isapnp/isapnpvar.h Sun Sep 25 17:20:03 2022
@@ -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) \
