Module Name: src
Committed By: thorpej
Date: Sat Nov 21 18:28:33 UTC 2020
Modified Files:
src/sys/arch/mipsco/isa: isa_machdep.c
src/sys/arch/mipsco/mipsco: bus_dma.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/mipsco/isa/isa_machdep.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/mipsco/mipsco/bus_dma.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/mipsco/isa/isa_machdep.c
diff -u src/sys/arch/mipsco/isa/isa_machdep.c:1.16 src/sys/arch/mipsco/isa/isa_machdep.c:1.17
--- src/sys/arch/mipsco/isa/isa_machdep.c:1.16 Sun Nov 10 21:16:30 2019
+++ src/sys/arch/mipsco/isa/isa_machdep.c Sat Nov 21 18:28:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.16 2019/11/10 21:16:30 chs Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.17 2020/11/21 18:28:32 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,12 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.16 2019/11/10 21:16:30 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.17 2020/11/21 18:28:32 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/queue.h>
#include <machine/sysconf.h>
@@ -179,7 +179,7 @@ isa_intr_establish(isa_chipset_tag_t ic,
{
struct mipsco_intrhand *ih;
- ih = malloc(sizeof *ih, M_DEVBUF, M_WAITOK);
+ ih = kmem_alloc(sizeof *ih, KM_SLEEP);
ih->ih_fun = ih_fun;
ih->ih_arg = ih_arg;
LIST_INSERT_HEAD(&ic->intr_q, ih, ih_q);
@@ -192,7 +192,7 @@ isa_intr_disestablish(isa_chipset_tag_t
struct mipsco_intrhand *ih = cookie;
LIST_REMOVE(ih, ih_q);
- free(ih, M_DEVBUF);
+ kmem_free(ih, sizeof(*ih));
}
int
Index: src/sys/arch/mipsco/mipsco/bus_dma.c
diff -u src/sys/arch/mipsco/mipsco/bus_dma.c:1.29 src/sys/arch/mipsco/mipsco/bus_dma.c:1.30
--- src/sys/arch/mipsco/mipsco/bus_dma.c:1.29 Thu Jun 11 08:22:09 2015
+++ src/sys/arch/mipsco/mipsco/bus_dma.c Sat Nov 21 18:28:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.29 2015/06/11 08:22:09 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.30 2020/11/21 18:28:33 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,13 +31,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.29 2015/06/11 08:22:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.30 2020/11/21 18:28:33 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <sys/device.h>
#include <sys/proc.h>
+#include <sys/kmem.h>
#include <uvm/uvm_extern.h>
@@ -74,6 +75,14 @@ _bus_dma_tag_init(bus_dma_tag_t t)
t->_dmamem_mmap = _bus_dmamem_mmap;
}
+static size_t
+_bus_dmamap_mapsize(int const nsegments)
+{
+ KASSERT(nsegments > 0);
+ return sizeof(struct mipsco_bus_dmamap) +
+ (sizeof(bus_dma_segment_t) * (nsegments - 1));
+}
+
/*
* Common function for DMA map creation. May be called by bus-specific
* DMA map creation functions.
@@ -83,7 +92,6 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
{
struct mipsco_bus_dmamap *map;
void *mapstore;
- size_t mapsize;
/*
* Allocate and initialize the DMA map. The end of the map
@@ -97,13 +105,10 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
* The bus_dmamap_t includes one bus_dma_segment_t, hence
* the (nsegments - 1).
*/
- mapsize = sizeof(struct mipsco_bus_dmamap) +
- (sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DMAMAP,
- (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL)
+ if ((mapstore = kmem_zalloc(_bus_dmamap_mapsize(nsegments),
+ (flags & BUS_DMA_NOWAIT) ? KM_NOSLEEP : KM_SLEEP)) == NULL)
return (ENOMEM);
- memset(mapstore, 0, mapsize);
map = (struct mipsco_bus_dmamap *)mapstore;
map->_dm_size = size;
map->_dm_segcnt = nsegments;
@@ -126,7 +131,7 @@ void
_bus_dmamap_destroy(bus_dma_tag_t t, bus_dmamap_t map)
{
- free(map, M_DMAMAP);
+ kmem_free(map, _bus_dmamap_mapsize(map->_dm_segcnt));
}
/*
