Module Name: src
Committed By: thorpej
Date: Sat Nov 21 17:48:26 UTC 2020
Modified Files:
src/sys/arch/ofppc/pci: gt_mainbus.c ofwpci.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ofppc/pci/gt_mainbus.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/ofppc/pci/ofwpci.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/ofppc/pci/gt_mainbus.c
diff -u src/sys/arch/ofppc/pci/gt_mainbus.c:1.5 src/sys/arch/ofppc/pci/gt_mainbus.c:1.6
--- src/sys/arch/ofppc/pci/gt_mainbus.c:1.5 Sun Nov 10 21:16:31 2019
+++ src/sys/arch/ofppc/pci/gt_mainbus.c Sat Nov 21 17:48:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gt_mainbus.c,v 1.5 2019/11/10 21:16:31 chs Exp $ */
+/* $NetBSD: gt_mainbus.c,v 1.6 2020/11/21 17:48:26 thorpej Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gt_mainbus.c,v 1.5 2019/11/10 21:16:31 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt_mainbus.c,v 1.6 2020/11/21 17:48:26 thorpej Exp $");
#include "opt_pci.h"
#include "opt_marvell.h"
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: gt_mainbus.c
#include <sys/device.h>
#include <sys/errno.h>
#include <sys/extent.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <machine/autoconf.h>
#include <sys/bus.h>
@@ -275,8 +275,8 @@ gtpci_md_attach_hook(device_t parent, de
/* Setup interrupts for PCI bus */
struct genppc_pci_chipset_businfo *pbi;
- 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);
SIMPLEQ_INIT(&genppc_gtpci1_chipset.pc_pbi);
Index: src/sys/arch/ofppc/pci/ofwpci.c
diff -u src/sys/arch/ofppc/pci/ofwpci.c:1.17 src/sys/arch/ofppc/pci/ofwpci.c:1.18
--- src/sys/arch/ofppc/pci/ofwpci.c:1.17 Tue Jul 7 03:38:47 2020
+++ src/sys/arch/ofppc/pci/ofwpci.c Sat Nov 21 17:48:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ofwpci.c,v 1.17 2020/07/07 03:38:47 thorpej Exp $ */
+/* $NetBSD: ofwpci.c,v 1.18 2020/11/21 17:48:26 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofwpci.c,v 1.17 2020/07/07 03:38:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwpci.c,v 1.18 2020/11/21 17:48:26 thorpej Exp $");
#include "opt_pci.h"
#include <sys/param.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/systm.h>
#include <dev/pci/pcivar.h>
@@ -195,8 +195,7 @@ ofwpci_attach(device_t parent, device_t
pc->pc_iot = &sc->sc_iot;
pc->pc_memt = &sc->sc_memt;
- 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);
SIMPLEQ_INIT(&pc->pc_pbi);
