Module Name: src
Committed By: thorpej
Date: Sat Nov 21 15:59:53 UTC 2020
Modified Files:
src/sys/arch/prep/pci: gten.c pci_machdep.c
src/sys/arch/prep/pnpbus: pnpbus.c
src/sys/arch/prep/prep: mainbus.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/prep/pci/gten.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/prep/pci/pci_machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/prep/pnpbus/pnpbus.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/prep/prep/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/prep/pci/gten.c
diff -u src/sys/arch/prep/pci/gten.c:1.21 src/sys/arch/prep/pci/gten.c:1.22
--- src/sys/arch/prep/pci/gten.c:1.21 Sun Nov 10 21:16:31 2019
+++ src/sys/arch/prep/pci/gten.c Sat Nov 21 15:59:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gten.c,v 1.21 2019/11/10 21:16:31 chs Exp $ */
+/* $NetBSD: gten.c,v 1.22 2020/11/21 15:59:53 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gten.c,v 1.21 2019/11/10 21:16:31 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gten.c,v 1.22 2020/11/21 15:59:53 thorpej Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: gten.c,v 1.2
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/systm.h>
#include <uvm/uvm_extern.h>
@@ -139,8 +139,8 @@ gten_attach(device_t parent, device_t se
gt->gt_ri = >en_console_ri;
gt->gt_nscreens = 1;
} else {
- gt->gt_ri = malloc(sizeof(*gt->gt_ri),
- M_DEVBUF, M_WAITOK|M_ZERO);
+ gt->gt_ri = kmem_zalloc(sizeof(*gt->gt_ri),
+ KM_SLEEP);
#if 0
error = pci_mapreg_map(pa, 0x14,
PCI_MAPREG_TYPE_MEM|PCI_MAPREG_MEM_TYPE_32BIT,
Index: src/sys/arch/prep/pci/pci_machdep.c
diff -u src/sys/arch/prep/pci/pci_machdep.c:1.43 src/sys/arch/prep/pci/pci_machdep.c:1.44
--- src/sys/arch/prep/pci/pci_machdep.c:1.43 Sun Nov 10 21:16:31 2019
+++ src/sys/arch/prep/pci/pci_machdep.c Sat Nov 21 15:59:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.43 2019/11/10 21:16:31 chs Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.44 2020/11/21 15:59:53 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.43 2019/11/10 21:16:31 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.44 2020/11/21 15:59:53 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
#include <sys/errno.h>
#include <sys/extent.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <uvm/uvm_extern.h>
@@ -323,8 +323,8 @@ prep_pci_conf_hook(void *v, int bus, int
*/
if (PCI_CLASS(class) == PCI_CLASS_BRIDGE &&
PCI_SUBCLASS(class) == PCI_SUBCLASS_BRIDGE_PCI) {
- 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);
setup_pciintr_map(pbi, bus, dev, func);
Index: src/sys/arch/prep/pnpbus/pnpbus.c
diff -u src/sys/arch/prep/pnpbus/pnpbus.c:1.12 src/sys/arch/prep/pnpbus/pnpbus.c:1.13
--- src/sys/arch/prep/pnpbus/pnpbus.c:1.12 Sun Nov 10 21:16:32 2019
+++ src/sys/arch/prep/pnpbus/pnpbus.c Sat Nov 21 15:59:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pnpbus.c,v 1.12 2019/11/10 21:16:32 chs Exp $ */
+/* $NetBSD: pnpbus.c,v 1.13 2020/11/21 15:59:53 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pnpbus.c,v 1.12 2019/11/10 21:16:32 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pnpbus.c,v 1.13 2020/11/21 15:59:53 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/extent.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/bus.h>
#include <machine/pio.h>
@@ -102,7 +102,7 @@ pnp_newirq(void *v, struct pnpresources
struct _S4_Pack *p = v;
struct pnpbus_irq *irq;
- irq = malloc(sizeof(struct pnpbus_irq), M_DEVBUF, M_WAITOK);
+ irq = kmem_alloc(sizeof(struct pnpbus_irq), KM_SLEEP);
irq->mask = le16dec(&p->IRQMask[0]);
@@ -123,7 +123,7 @@ pnp_newdma(void *v, struct pnpresources
struct _S5_Pack *p = v;
struct pnpbus_dma *dma;
- dma = malloc(sizeof(struct pnpbus_dma), M_DEVBUF, M_WAITOK);
+ dma = kmem_alloc(sizeof(struct pnpbus_dma), KM_SLEEP);
dma->mask = le16dec(&p->DMAMask);
if (size > 2)
@@ -144,7 +144,7 @@ pnp_newioport(void *v, struct pnpresourc
struct pnpbus_io *io;
uint16_t mask;
- io = malloc(sizeof(struct pnpbus_io), M_DEVBUF, M_WAITOK);
+ io = kmem_alloc(sizeof(struct pnpbus_io), KM_SLEEP);
mask = p->IOInfo & ISAAddr16bit ? 0xffff : 0x03ff;
io->minbase = (p->RangeMin[0] | (p->RangeMin[1] << 8)) & mask;
io->maxbase = (p->RangeMax[0] | (p->RangeMax[1] << 8)) & mask;
@@ -164,7 +164,7 @@ pnp_newfixedioport(void *v, struct pnpre
struct _S9_Pack *p = v;
struct pnpbus_io *io;
- io = malloc(sizeof(struct pnpbus_io), M_DEVBUF, M_WAITOK);
+ io = kmem_alloc(sizeof(struct pnpbus_io), KM_SLEEP);
io->minbase = (p->Range[0] | (p->Range[1] << 8)) & 0x3ff;
io->len = p->IONum;
io->maxbase = -1;
@@ -184,7 +184,7 @@ pnp_newiomem(void *v, struct pnpresource
struct _L1_Pack *pack = v;
if (pack->Count0 >= 0x9) {
- mem = malloc(sizeof(struct pnpbus_mem), M_DEVBUF, M_WAITOK);
+ mem = kmem_alloc(sizeof(struct pnpbus_mem), KM_SLEEP);
mem->minbase = (pack->Data[2] << 16) | (pack->Data[1] << 8);
mem->maxbase = (pack->Data[4] << 16) | (pack->Data[3] << 8);
mem->align = (pack->Data[6] << 8) | pack->Data[5];
@@ -206,7 +206,7 @@ pnp_newaddr(void *v, struct pnpresources
struct _L4_PPCPack *p = &pack->L4_Data.L4_PPCPack;
if (p->PPCData[0] == 1) {/* type IO */
- io = malloc(sizeof(struct pnpbus_io), M_DEVBUF, M_WAITOK);
+ io = kmem_alloc(sizeof(struct pnpbus_io), KM_SLEEP);
io->minbase = (uint16_t)le64dec(&p->PPCData[4]);
io->maxbase = -1;
io->align = p->PPCData[1];
@@ -217,7 +217,7 @@ pnp_newaddr(void *v, struct pnpresources
return 0;
} else if (p->PPCData[0] == 2) {
- mem = malloc(sizeof(struct pnpbus_mem), M_DEVBUF, M_WAITOK);
+ mem = kmem_alloc(sizeof(struct pnpbus_mem), KM_SLEEP);
mem->minbase = (uint32_t)le64dec(&p->PPCData[4]);
mem->maxbase = -1;
mem->align = p->PPCData[1];
@@ -238,7 +238,7 @@ pnp_newcompatid(void *v, struct pnpresou
struct pnpbus_compatid *id;
uint32_t cid;
- id = malloc(sizeof(*id), M_DEVBUF, M_WAITOK);
+ id = kmem_alloc(sizeof(*id), KM_SLEEP);
cid = le32dec(p->CompatId);
pnp_devid_to_string(cid, id->idstr);
id->next = r->compatids;
Index: src/sys/arch/prep/prep/mainbus.c
diff -u src/sys/arch/prep/prep/mainbus.c:1.37 src/sys/arch/prep/prep/mainbus.c:1.38
--- src/sys/arch/prep/prep/mainbus.c:1.37 Tue Jul 7 03:38:48 2020
+++ src/sys/arch/prep/prep/mainbus.c Sat Nov 21 15:59:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.37 2020/07/07 03:38:48 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.38 2020/11/21 15:59:53 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.37 2020/07/07 03:38:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.38 2020/11/21 15:59:53 thorpej Exp $");
#include "opt_pci.h"
#include "opt_residual.h"
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v
#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>
@@ -130,12 +130,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);
prep_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);
