Module Name: src
Committed By: thorpej
Date: Sat Nov 21 17:49:20 UTC 2020
Modified Files:
src/sys/arch/next68k/dev: if_xe.c nextdisplay.c nextkbd.c
src/sys/arch/next68k/next68k: isr.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/next68k/dev/if_xe.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/next68k/dev/nextdisplay.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/next68k/dev/nextkbd.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/next68k/next68k/isr.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/next68k/dev/if_xe.c
diff -u src/sys/arch/next68k/dev/if_xe.c:1.26 src/sys/arch/next68k/dev/if_xe.c:1.27
--- src/sys/arch/next68k/dev/if_xe.c:1.26 Sun Nov 10 21:16:31 2019
+++ src/sys/arch/next68k/dev/if_xe.c Sat Nov 21 17:49:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xe.c,v 1.26 2019/11/10 21:16:31 chs Exp $ */
+/* $NetBSD: if_xe.c,v 1.27 2020/11/21 17:49:20 thorpej Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xe.c,v 1.26 2019/11/10 21:16:31 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xe.c,v 1.27 2020/11/21 17:49:20 thorpej Exp $");
#include "opt_inet.h"
@@ -35,6 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_xe.c,v 1.
#include <sys/syslog.h>
#include <sys/socket.h>
#include <sys/device.h>
+#include <sys/kmem.h>
#include <net/if.h>
#include <net/if_ether.h>
@@ -205,7 +206,7 @@ findchannel_defer(device_t self)
* the 2000 covers at least a 1500 mtu + headers
* + DMA_BEGINALIGNMENT+ DMA_ENDALIGNMENT
*/
- xsc->sc_txbuf = malloc(2000, M_DEVBUF, M_WAITOK);
+ xsc->sc_txbuf = kmem_alloc(2000, KM_SLEEP);
xsc->sc_tx_mb_head = NULL;
xsc->sc_tx_loaded = 0;
Index: src/sys/arch/next68k/dev/nextdisplay.c
diff -u src/sys/arch/next68k/dev/nextdisplay.c:1.22 src/sys/arch/next68k/dev/nextdisplay.c:1.23
--- src/sys/arch/next68k/dev/nextdisplay.c:1.22 Tue Nov 12 13:17:44 2019
+++ src/sys/arch/next68k/dev/nextdisplay.c Sat Nov 21 17:49:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nextdisplay.c,v 1.22 2019/11/12 13:17:44 msaitoh Exp $ */
+/* $NetBSD: nextdisplay.c,v 1.23 2020/11/21 17:49:20 thorpej Exp $ */
/*
* Copyright (c) 1998 Matt DeBergalis
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nextdisplay.c,v 1.22 2019/11/12 13:17:44 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextdisplay.c,v 1.23 2020/11/21 17:49:20 thorpej Exp $");
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: nextdisplay.
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <machine/bus.h>
#include <machine/cpu.h>
@@ -251,8 +251,8 @@ nextdisplay_attach(device_t parent, devi
sc->sc_dc = &nextdisplay_console_dc;
sc->nscreens = 1;
} else {
- sc->sc_dc = (struct nextdisplay_config *)
- malloc(sizeof(struct nextdisplay_config), M_DEVBUF, M_WAITOK);
+ sc->sc_dc = kmem_alloc(sizeof(struct nextdisplay_config),
+ KM_SLEEP);
nextdisplay_init(sc->sc_dc, iscolor);
}
Index: src/sys/arch/next68k/dev/nextkbd.c
diff -u src/sys/arch/next68k/dev/nextkbd.c:1.15 src/sys/arch/next68k/dev/nextkbd.c:1.16
--- src/sys/arch/next68k/dev/nextkbd.c:1.15 Mon Mar 24 20:01:03 2014
+++ src/sys/arch/next68k/dev/nextkbd.c Sat Nov 21 17:49:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nextkbd.c,v 1.15 2014/03/24 20:01:03 christos Exp $ */
+/* $NetBSD: nextkbd.c,v 1.16 2020/11/21 17:49:20 thorpej Exp $ */
/*
* Copyright (c) 1998 Matt DeBergalis
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nextkbd.c,v 1.15 2014/03/24 20:01:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextkbd.c,v 1.16 2020/11/21 17:49:20 thorpej Exp $");
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: nextkbd.c,v
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/errno.h>
#include <sys/queue.h>
#include <sys/bus.h>
@@ -152,10 +152,9 @@ nextkbd_attach(device_t parent, device_t
if (isconsole) {
sc->id = &nextkbd_consdata;
} else {
- sc->id = malloc(sizeof(struct nextkbd_internal),
- M_DEVBUF, M_WAITOK);
+ sc->id = kmem_zalloc(sizeof(struct nextkbd_internal),
+ KM_SLEEP);
- memset(sc->id, 0, sizeof(struct nextkbd_internal));
sc->id->iot = ia->ia_bst;
if (bus_space_map(sc->id->iot, NEXT_P_MON,
sizeof(struct mon_regs),
Index: src/sys/arch/next68k/next68k/isr.c
diff -u src/sys/arch/next68k/next68k/isr.c:1.30 src/sys/arch/next68k/next68k/isr.c:1.31
--- src/sys/arch/next68k/next68k/isr.c:1.30 Sun Nov 10 21:16:31 2019
+++ src/sys/arch/next68k/next68k/isr.c Sat Nov 21 17:49:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: isr.c,v 1.30 2019/11/10 21:16:31 chs Exp $ */
+/* $NetBSD: isr.c,v 1.31 2020/11/21 17:49:20 thorpej Exp $ */
/*
* This file was taken from mvme68k/mvme68k/isr.c
@@ -41,11 +41,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.30 2019/11/10 21:16:31 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.31 2020/11/21 17:49:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/vmmeter.h>
#include <sys/device.h>
#include <sys/bus.h>
@@ -117,7 +117,7 @@ isrlink_autovec(int (*func)(void *), voi
panic("isrlink_autovec: bad ipl %d", ipl);
#endif
- newisr = malloc(sizeof(struct isr_autovec), M_DEVBUF, M_WAITOK);
+ newisr = kmem_alloc(sizeof(*newisr), KM_SLEEP);
newisr->isr_func = func;
newisr->isr_arg = arg;
newisr->isr_ipl = ipl;
