Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

malloc(9) -> kmem(9)

This commit is contained in:
thorpej 2020-11-21 19:24:17 +00:00
parent 1ecad92072
commit 12d68b3ede
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/arch/emips/emips/bus_dma.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus_dma.c,v 1.4 2015/06/11 08:22:08 matt Exp $ */
/* $NetBSD: bus_dma.c,v 1.5 2020/11/21 19:24:17 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.4 2015/06/11 08:22:08 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.5 2020/11/21 19:24:17 thorpej Exp $");
#include "opt_cputype.h"
@ -39,6 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.4 2015/06/11 08:22:08 matt Exp $");
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <sys/proc.h>
#include <sys/kmem.h>
#include <uvm/uvm_extern.h>
@ -87,6 +88,14 @@ emips_bus_dma_init(void)
#endif
}
static size_t
_bus_dmamap_mapsize(int const nsegments)
{
KASSERT(nsegments > 0);
return sizeof(struct emips_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.
@ -97,7 +106,6 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
{
struct emips_bus_dmamap *map;
void *mapstore;
size_t mapsize;
/*
* Allocate and initialize the DMA map. The end of the map
@ -111,13 +119,10 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
* The bus_dmamap_t includes one bus_dma_segment_t, hence
* the (nsegments - 1).
*/
mapsize = sizeof(struct emips_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 emips_bus_dmamap *)mapstore;
map->_dm_size = size;
map->_dm_segcnt = nsegments;
@ -141,7 +146,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));
}
/*