Module Name: src
Committed By: thorpej
Date: Sat Nov 21 15:52:32 UTC 2020
Modified Files:
src/sys/arch/rs6000/mca: mca_machdep.c mcadma_machdep.c
src/sys/arch/rs6000/rs6000: pic_iocc.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/rs6000/mca/mca_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/rs6000/mca/mcadma_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/rs6000/rs6000/pic_iocc.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/rs6000/mca/mca_machdep.c
diff -u src/sys/arch/rs6000/mca/mca_machdep.c:1.4 src/sys/arch/rs6000/mca/mca_machdep.c:1.5
--- src/sys/arch/rs6000/mca/mca_machdep.c:1.4 Mon Jul 18 17:26:56 2011
+++ src/sys/arch/rs6000/mca/mca_machdep.c Sat Nov 21 15:52:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mca_machdep.c,v 1.4 2011/07/18 17:26:56 dyoung Exp $ */
+/* $NetBSD: mca_machdep.c,v 1.5 2020/11/21 15:52:32 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -36,12 +36,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mca_machdep.c,v 1.4 2011/07/18 17:26:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mca_machdep.c,v 1.5 2020/11/21 15:52:32 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/systm.h>
#include <sys/syslog.h>
#include <sys/time.h>
@@ -381,8 +381,8 @@ mca_dmamap_create(bus_dma_tag_t t, bus_s
/*
* Allocate our cookie if not yet done.
*/
- cookie = malloc(sizeof(struct rs6000_dma_cookie), M_DMAMAP,
- ((flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK) | M_ZERO);
+ cookie = kmem_zalloc(sizeof(struct rs6000_dma_cookie),
+ ((flags & BUS_DMA_NOWAIT) ? KM_SLEEP : KM_NOSLEEP));
if (cookie == NULL) {
return ENOMEM;
Index: src/sys/arch/rs6000/mca/mcadma_machdep.c
diff -u src/sys/arch/rs6000/mca/mcadma_machdep.c:1.3 src/sys/arch/rs6000/mca/mcadma_machdep.c:1.4
--- src/sys/arch/rs6000/mca/mcadma_machdep.c:1.3 Mon Jul 18 17:26:56 2011
+++ src/sys/arch/rs6000/mca/mcadma_machdep.c Sat Nov 21 15:52:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mcadma_machdep.c,v 1.3 2011/07/18 17:26:56 dyoung Exp $ */
+/* $NetBSD: mcadma_machdep.c,v 1.4 2020/11/21 15:52:32 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcadma_machdep.c,v 1.3 2011/07/18 17:26:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcadma_machdep.c,v 1.4 2020/11/21 15:52:32 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/syslog.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/proc.h>
#include <sys/mbuf.h>
@@ -116,8 +116,8 @@ _mca_bus_dmamap_create(bus_dma_tag_t t,
/*
* Allocate our cookie if not yet done.
*/
- cookie = malloc(sizeof(struct rs6000_dma_cookie), M_DMAMAP,
- ((flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK) | M_ZERO);
+ cookie = kmem_zalloc(sizeof(struct rs6000_dma_cookie),
+ ((flags & BUS_DMA_NOWAIT) ? KM_NOSLEEP : KM_SLEEP));
if (cookie == NULL) {
return ENOMEM;
@@ -143,7 +143,7 @@ _mca_bus_dmamap_destroy(bus_dma_tag_t t,
{
struct rs6000_dma_cookie *cookie = map->_dm_cookie;
- free(cookie, M_DMAMAP);
+ kmem_free(cookie, sizeof(struct rs6000_dma_cookie));
_bus_dmamap_destroy(t, map);
}
Index: src/sys/arch/rs6000/rs6000/pic_iocc.c
diff -u src/sys/arch/rs6000/rs6000/pic_iocc.c:1.5 src/sys/arch/rs6000/rs6000/pic_iocc.c:1.6
--- src/sys/arch/rs6000/rs6000/pic_iocc.c:1.5 Sun Nov 10 21:16:32 2019
+++ src/sys/arch/rs6000/rs6000/pic_iocc.c Sat Nov 21 15:52:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_iocc.c,v 1.5 2019/11/10 21:16:32 chs Exp $ */
+/* $NetBSD: pic_iocc.c,v 1.6 2020/11/21 15:52:32 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,10 +30,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_iocc.c,v 1.5 2019/11/10 21:16:32 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_iocc.c,v 1.6 2020/11/21 15:52:32 thorpej Exp $");
#include <sys/param.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/kernel.h>
#include <sys/bus.h>
@@ -59,7 +59,7 @@ setup_iocc(void)
struct pic_ops *pic;
int i;
- pic = malloc(sizeof(struct pic_ops), M_DEVBUF, M_WAITOK);
+ pic = kmem_alloc(sizeof(struct pic_ops), KM_SLEEP);
pic->pic_numintrs = 16;
pic->pic_cookie = (void *)NULL;
pic->pic_enable_irq = iocc_enable_irq;
