Module Name: src
Committed By: thorpej
Date: Sat Nov 21 17:57:40 UTC 2020
Modified Files:
src/sys/arch/mvmeppc/mvmeppc: mainbus.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mvmeppc/mvmeppc/mainbus.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/mvmeppc/mvmeppc/mainbus.c
diff -u src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.19 src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.20
--- src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.19 Tue Jul 7 03:38:47 2020
+++ src/sys/arch/mvmeppc/mvmeppc/mainbus.c Sat Nov 21 17:57:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.19 2020/07/07 03:38:47 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.20 2020/11/21 17:57:40 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,12 +31,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.19 2020/07/07 03:38:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.20 2020/11/21 17:57:40 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <machine/autoconf.h>
#include <sys/bus.h>
@@ -107,12 +107,10 @@ mainbus_attach(device_t parent, device_t
* XXX that's not currently possible.
*/
#if NPCI > 0
- genppc_pct = malloc(sizeof(struct genppc_pci_chipset), M_DEVBUF,
- M_WAITOK);
+ genppc_pct = kmem_alloc(sizeof(struct genppc_pci_chipset), KM_SLEEP);
mvmeppc_pci_get_chipset_tag(genppc_pct);
- pbi = malloc(sizeof(struct genppc_pci_chipset_businfo),
- M_DEVBUF, M_WAITOK);
+ pbi = kmem_alloc(sizeof(struct genppc_pci_chipset_businfo), KM_SLEEP);
pbi->pbi_properties = prop_dictionary_create();
KASSERT(pbi->pbi_properties != NULL);
