Module Name: src
Committed By: thorpej
Date: Sat Nov 21 15:42:21 UTC 2020
Modified Files:
src/sys/arch/evbppc/explora/dev: fb_elb.c pckbc_elb.c
src/sys/arch/evbppc/pmppc: pic_cpc700.c
src/sys/arch/evbppc/pmppc/dev: cpc_mainbus.c
src/sys/arch/evbppc/virtex: design_gsrd1.c
src/sys/arch/evbppc/walnut/dev: pckbc_pbus.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbppc/explora/dev/fb_elb.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/explora/dev/pckbc_elb.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/pmppc/pic_cpc700.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/virtex/design_gsrd1.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbppc/walnut/dev/pckbc_pbus.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/evbppc/explora/dev/fb_elb.c
diff -u src/sys/arch/evbppc/explora/dev/fb_elb.c:1.13 src/sys/arch/evbppc/explora/dev/fb_elb.c:1.14
--- src/sys/arch/evbppc/explora/dev/fb_elb.c:1.13 Fri Jul 1 19:02:32 2011
+++ src/sys/arch/evbppc/explora/dev/fb_elb.c Sat Nov 21 15:42:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fb_elb.c,v 1.13 2011/07/01 19:02:32 dyoung Exp $ */
+/* $NetBSD: fb_elb.c,v 1.14 2020/11/21 15:42:20 thorpej Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.13 2011/07/01 19:02:32 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.14 2020/11/21 15:42:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/systm.h>
#include <dev/wscons/wsconsio.h>
@@ -143,8 +143,7 @@ fb_elb_attach(device_t parent, device_t
sc->sc_fb = &console_dev;
sc->sc_fb->fb_ri.ri_flg &= ~RI_NO_AUTO;
} else {
- sc->sc_fb = malloc(sizeof(struct fb_dev), M_DEVBUF, M_WAITOK);
- memset(sc->sc_fb, 0, sizeof(struct fb_dev));
+ sc->sc_fb = kmem_zalloc(sizeof(struct fb_dev), KM_SLEEP);
}
sc->sc_fb->fb_iot = eaa->elb_bt;
Index: src/sys/arch/evbppc/explora/dev/pckbc_elb.c
diff -u src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.7 src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.8
--- src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.7 Fri Jul 1 19:02:32 2011
+++ src/sys/arch/evbppc/explora/dev/pckbc_elb.c Sat Nov 21 15:42:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_elb.c,v 1.7 2011/07/01 19:02:32 dyoung Exp $ */
+/* $NetBSD: pckbc_elb.c,v 1.8 2020/11/21 15:42:20 thorpej Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.7 2011/07/01 19:02:32 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.8 2020/11/21 15:42:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/bus.h>
@@ -88,8 +88,7 @@ pckbc_elb_attach(device_t parent, device
t = &pckbc_consdata;
pckbc_console_attached = 1;
} else {
- t = malloc(sizeof(struct pckbc_internal), M_DEVBUF, M_WAITOK);
- memset(t, 0, sizeof(struct pckbc_internal));
+ t = kmem_zalloc(sizeof(struct pckbc_internal), KM_SLEEP);
}
t->t_iot = eaa->elb_bt;
Index: src/sys/arch/evbppc/pmppc/pic_cpc700.c
diff -u src/sys/arch/evbppc/pmppc/pic_cpc700.c:1.7 src/sys/arch/evbppc/pmppc/pic_cpc700.c:1.8
--- src/sys/arch/evbppc/pmppc/pic_cpc700.c:1.7 Sun Nov 10 21:16:26 2019
+++ src/sys/arch/evbppc/pmppc/pic_cpc700.c Sat Nov 21 15:42:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_cpc700.c,v 1.7 2019/11/10 21:16:26 chs Exp $ */
+/* $NetBSD: pic_cpc700.c,v 1.8 2020/11/21 15:42:20 thorpej Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,10 +30,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_cpc700.c,v 1.7 2019/11/10 21:16:26 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_cpc700.c,v 1.8 2020/11/21 15:42:20 thorpej Exp $");
#include <sys/param.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/kernel.h>
#include <machine/pio.h>
@@ -60,7 +60,7 @@ setup_cpc700(void)
struct cpc700_ops *cpc700;
struct pic_ops *pic;
- cpc700 = malloc(sizeof(struct cpc700_ops), M_DEVBUF, M_WAITOK);
+ cpc700 = kmem_alloc(sizeof(struct cpc700_ops), KM_SLEEP);
pic = &cpc700->pic;
pic->pic_numintrs = 32;
Index: src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c
diff -u src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c:1.7 src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c:1.8
--- src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c:1.7 Sun Nov 10 21:16:26 2019
+++ src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c Sat Nov 21 15:42:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpc_mainbus.c,v 1.7 2019/11/10 21:16:26 chs Exp $ */
+/* $NetBSD: cpc_mainbus.c,v 1.8 2020/11/21 15:42:20 thorpej Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,12 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpc_mainbus.c,v 1.7 2019/11/10 21:16:26 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpc_mainbus.c,v 1.8 2020/11/21 15:42:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/extent.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/systm.h>
#include <sys/bus.h>
@@ -78,11 +78,9 @@ cpc_mainbus_attach(device_t parent, devi
{
struct genppc_pci_chipset_businfo *pbi;
- genppc_pct = malloc(sizeof(struct genppc_pci_chipset), M_DEVBUF,
- M_WAITOK);
+ genppc_pct = kmem_alloc(sizeof(struct genppc_pci_chipset), KM_SLEEP);
pmppc_pci_get_chipset_tag(genppc_pct);
- pbi = malloc(sizeof(struct genppc_pci_chipset_businfo),
- M_DEVBUF, M_WAITOK);
+ pbi = kmem_alloc(sizeof(struct genppc_pci_chipset_businfo), KM_SLEEP);
pbi->pbi_properties = prop_dictionary_create();
KASSERT(pbi->pbi_properties != NULL);
SIMPLEQ_INIT(&genppc_pct->pc_pbi);
Index: src/sys/arch/evbppc/virtex/design_gsrd1.c
diff -u src/sys/arch/evbppc/virtex/design_gsrd1.c:1.4 src/sys/arch/evbppc/virtex/design_gsrd1.c:1.5
--- src/sys/arch/evbppc/virtex/design_gsrd1.c:1.4 Sun Nov 10 21:16:27 2019
+++ src/sys/arch/evbppc/virtex/design_gsrd1.c Sat Nov 21 15:42:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: design_gsrd1.c,v 1.4 2019/11/10 21:16:27 chs Exp $ */
+/* $NetBSD: design_gsrd1.c,v 1.5 2020/11/21 15:42:20 thorpej Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -30,13 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: design_gsrd1.c,v 1.4 2019/11/10 21:16:27 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: design_gsrd1.c,v 1.5 2020/11/21 15:42:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/cpu.h>
#include <sys/bus.h>
#include <sys/intr.h>
@@ -373,7 +373,7 @@ ll_dmac_intr_establish(int chan, void (*
if (cdmac_intrs[chan] != NULL)
return (NULL);
- ih = malloc(sizeof(struct cdmac_intr_handle), M_DEVBUF, M_WAITOK);
+ ih = kmem_alloc(sizeof(*ih), KM_SLEEP);
ih->cih_func = func;
ih->cih_arg = arg;
@@ -383,6 +383,7 @@ ll_dmac_intr_establish(int chan, void (*
void
ll_dmac_intr_disestablish(int chan, void *handle)
{
+ struct cdmac_intr_handle *ih = handle;
int s;
KASSERT(chan > 0 && chan < CDMAC_NCHAN);
@@ -392,7 +393,7 @@ ll_dmac_intr_disestablish(int chan, void
cdmac_intrs[chan] = NULL;
splx(s);
- free(handle, M_DEVBUF);
+ kmem_free(ih, sizeof(*ih));
}
int
Index: src/sys/arch/evbppc/walnut/dev/pckbc_pbus.c
diff -u src/sys/arch/evbppc/walnut/dev/pckbc_pbus.c:1.4 src/sys/arch/evbppc/walnut/dev/pckbc_pbus.c:1.5
--- src/sys/arch/evbppc/walnut/dev/pckbc_pbus.c:1.4 Sat Mar 15 13:23:24 2008
+++ src/sys/arch/evbppc/walnut/dev/pckbc_pbus.c Sat Nov 21 15:42:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_pbus.c,v 1.4 2008/03/15 13:23:24 cube Exp $ */
+/* $NetBSD: pckbc_pbus.c,v 1.5 2020/11/21 15:42:20 thorpej Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -36,13 +36,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_pbus.c,v 1.4 2008/03/15 13:23:24 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_pbus.c,v 1.5 2020/11/21 15:42:20 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 <machine/intr.h>
#include <machine/walnut.h>
@@ -114,8 +114,7 @@ pckbc_pbus_attach(device_t parent, devic
bus_space_map(iot, addr + KEY_MOUSE_CMD, 1, 0, &ioh_c))
panic("pckbc_attach: couldn't map");
- t = malloc(sizeof(struct pckbc_internal), M_DEVBUF, M_WAITOK);
- memset(t, 0, sizeof(struct pckbc_internal));
+ t = kmem_zalloc(sizeof(struct pckbc_internal), KM_SLEEP);
t->t_iot = iot;
t->t_ioh_d = ioh_d;
t->t_ioh_c = ioh_c;
