Module Name: src
Committed By: thorpej
Date: Sat Nov 21 17:54:48 UTC 2020
Modified Files:
src/sys/arch/newsmips/apbus: apbus.c xafb.c
src/sys/arch/newsmips/dev: fb.c hb.c
src/sys/arch/newsmips/newsmips: bus.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/newsmips/apbus/apbus.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/newsmips/apbus/xafb.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/newsmips/dev/fb.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/newsmips/dev/hb.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/newsmips/newsmips/bus.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/newsmips/apbus/apbus.c
diff -u src/sys/arch/newsmips/apbus/apbus.c:1.26 src/sys/arch/newsmips/apbus/apbus.c:1.27
--- src/sys/arch/newsmips/apbus/apbus.c:1.26 Sun Nov 10 21:16:31 2019
+++ src/sys/arch/newsmips/apbus/apbus.c Sat Nov 21 17:54:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: apbus.c,v 1.26 2019/11/10 21:16:31 chs Exp $ */
+/* $NetBSD: apbus.c,v 1.27 2020/11/21 17:54:47 thorpej Exp $ */
/*-
* Copyright (C) 1999 SHIMIZU Ryo. All rights reserved.
@@ -27,13 +27,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apbus.c,v 1.26 2019/11/10 21:16:31 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apbus.c,v 1.27 2020/11/21 17:54:47 thorpej Exp $");
#define __INTR_PRIVATE
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/device.h>
#include <sys/proc.h>
#include <sys/intr.h>
@@ -230,7 +230,7 @@ apbus_intr_establish(int level, int mask
ip = &apintr_tab[level];
- ih = malloc(sizeof(*ih), M_DEVBUF, M_WAITOK);
+ ih = kmem_alloc(sizeof(*ih), KM_SLEEP);
ih->ih_mask = mask;
ih->ih_priority = priority;
ih->ih_func = func;
@@ -501,7 +501,7 @@ apbus_dmatag_init(struct apbus_attach_ar
{
struct newsmips_bus_dma_tag *dmat;
- dmat = malloc(sizeof(*dmat), M_DEVBUF, M_WAITOK);
+ dmat = kmem_alloc(sizeof(*dmat), KM_SLEEP);
memcpy(dmat, &apbus_dma_tag, sizeof(*dmat));
dmat->_slotno = apa->apa_slotno;
dmat->_slotbaset = 0;
Index: src/sys/arch/newsmips/apbus/xafb.c
diff -u src/sys/arch/newsmips/apbus/xafb.c:1.18 src/sys/arch/newsmips/apbus/xafb.c:1.19
--- src/sys/arch/newsmips/apbus/xafb.c:1.18 Thu Jul 21 19:49:58 2016
+++ src/sys/arch/newsmips/apbus/xafb.c Sat Nov 21 17:54:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xafb.c,v 1.18 2016/07/21 19:49:58 christos Exp $ */
+/* $NetBSD: xafb.c,v 1.19 2020/11/21 17:54:47 thorpej Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -29,13 +29,13 @@
/* "xa" frame buffer driver. Currently supports 1280x1024x8 only. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xafb.c,v 1.18 2016/07/21 19:49:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xafb.c,v 1.19 2020/11/21 17:54:47 thorpej Exp $");
#include <sys/param.h>
#include <sys/buf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/systm.h>
#include <uvm/uvm_extern.h>
@@ -157,8 +157,7 @@ xafb_attach(device_t parent, device_t se
ri->ri_flg &= ~RI_NO_AUTO;
sc->sc_nscreens = 1;
} else {
- dc = malloc(sizeof(struct xafb_devconfig), M_DEVBUF,
- M_WAITOK|M_ZERO);
+ dc = kmem_zalloc(sizeof(struct xafb_devconfig), KM_SLEEP);
dc->dc_fbpaddr = (paddr_t)0x10000000;
dc->dc_fbbase = (void *)MIPS_PHYS_TO_KSEG1(dc->dc_fbpaddr);
dc->dc_reg = (void *)(apa->apa_hwbase + 0x3000);
Index: src/sys/arch/newsmips/dev/fb.c
diff -u src/sys/arch/newsmips/dev/fb.c:1.26 src/sys/arch/newsmips/dev/fb.c:1.27
--- src/sys/arch/newsmips/dev/fb.c:1.26 Fri Jan 31 15:43:06 2014
+++ src/sys/arch/newsmips/dev/fb.c Sat Nov 21 17:54:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fb.c,v 1.26 2014/01/31 15:43:06 tsutsui Exp $ */
+/* $NetBSD: fb.c,v 1.27 2020/11/21 17:54:47 thorpej Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,12 +27,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.26 2014/01/31 15:43:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.27 2020/11/21 17:54:47 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/ioctl.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/systm.h>
#include <uvm/uvm_extern.h>
@@ -146,8 +146,7 @@ fb_attach(device_t parent, device_t self
ri->ri_flg &= ~RI_NO_AUTO;
sc->sc_nscreens = 1;
} else {
- dc = malloc(sizeof(struct fb_devconfig), M_DEVBUF,
- M_WAITOK|M_ZERO);
+ dc = kmem_zalloc(sizeof(struct fb_devconfig), KM_SLEEP);
dc->dc_fbbase = NWB253_VRAM;
fb_common_init(dc);
Index: src/sys/arch/newsmips/dev/hb.c
diff -u src/sys/arch/newsmips/dev/hb.c:1.20 src/sys/arch/newsmips/dev/hb.c:1.21
--- src/sys/arch/newsmips/dev/hb.c:1.20 Sun Nov 10 21:16:31 2019
+++ src/sys/arch/newsmips/dev/hb.c Sat Nov 21 17:54:47 2020
@@ -1,13 +1,13 @@
-/* $NetBSD: hb.c,v 1.20 2019/11/10 21:16:31 chs Exp $ */
+/* $NetBSD: hb.c,v 1.21 2020/11/21 17:54:47 thorpej Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hb.c,v 1.20 2019/11/10 21:16:31 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hb.c,v 1.21 2020/11/21 17:54:47 thorpej Exp $");
#define __INTR_PRIVATE
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/intr.h>
#include <machine/autoconf.h>
@@ -99,7 +99,7 @@ hb_intr_establish(int level, int mask, i
ip = &hbintr_tab[level];
- ih = malloc(sizeof(*ih), M_DEVBUF, M_WAITOK);
+ ih = kmem_alloc(sizeof(*ih), KM_SLEEP);
ih->ih_func = func;
ih->ih_arg = arg;
ih->ih_level = level;
Index: src/sys/arch/newsmips/newsmips/bus.c
diff -u src/sys/arch/newsmips/newsmips/bus.c:1.33 src/sys/arch/newsmips/newsmips/bus.c:1.34
--- src/sys/arch/newsmips/newsmips/bus.c:1.33 Thu Jun 11 08:22:09 2015
+++ src/sys/arch/newsmips/newsmips/bus.c Sat Nov 21 17:54:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.33 2015/06/11 08:22:09 matt Exp $ */
+/* $NetBSD: bus.c,v 1.34 2020/11/21 17:54:48 thorpej Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,13 +31,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.33 2015/06/11 08:22:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.34 2020/11/21 17:54:48 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/proc.h>
#include <sys/mbuf.h>
@@ -132,6 +132,14 @@ bus_space_subregion(bus_space_tag_t t, b
return 0;
}
+static size_t
+_bus_dmamap_mapsize(int const nsegments)
+{
+ KASSERT(nsegments > 0);
+ return sizeof(struct newsmips_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.
@@ -142,7 +150,6 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
{
struct newsmips_bus_dmamap *map;
void *mapstore;
- size_t mapsize;
/*
* Allocate and initialize the DMA map. The end of the map
@@ -156,10 +163,8 @@ _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 newsmips_bus_dmamap) +
- (sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DMAMAP,
- ((flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)|M_ZERO)) == NULL)
+ if ((mapstore = kmem_zalloc(_bus_dmamap_mapsize(nsegments),
+ (flags & BUS_DMA_NOWAIT) ? KM_NOSLEEP : KM_SLEEP)) == NULL)
return ENOMEM;
map = (struct newsmips_bus_dmamap *)mapstore;
@@ -185,7 +190,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));
}
extern paddr_t kvtophys(vaddr_t); /* XXX */
