Module Name: src
Committed By: matt
Date: Wed Feb 1 09:54:03 UTC 2012
Modified Files:
src/sys/arch/powerpc/ibm4xx: pic_uic.c
src/sys/arch/powerpc/isa: isadma_machdep.c isapnp_machdep.c
src/sys/arch/powerpc/marvell: pic_discovery.c
src/sys/arch/powerpc/oea: cpu_subr.c oea_machdep.c ofw_rascons.c pmap.c
prep_machdep.c
src/sys/arch/powerpc/pci: pci_machdep_common.c pci_machdep_ofw.c
src/sys/arch/powerpc/pic: i8259_common.c intr.c ipi_openpic.c
openpic_common.c pic_distopenpic.c pic_i8259.c pic_mpcsoc.c
pic_openpic.c pic_prepivr.c
src/sys/arch/powerpc/powerpc: bus_dma.c bus_space.c ofw_machdep.c
pmap_subr.c
Log Message:
Use kmem instead of malloc. Remove unneeded <sys/malloc.h> includes.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/ibm4xx/pic_uic.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/isa/isadma_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/isa/isapnp_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/marvell/pic_discovery.c
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/powerpc/oea/cpu_subr.c
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/powerpc/oea/oea_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/oea/ofw_rascons.c
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/powerpc/oea/pmap.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/oea/prep_machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/powerpc/pci/pci_machdep_common.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/pci/pci_machdep_ofw.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/pic/i8259_common.c \
src/sys/arch/powerpc/pic/ipi_openpic.c \
src/sys/arch/powerpc/pic/pic_prepivr.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/powerpc/pic/intr.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/pic/openpic_common.c \
src/sys/arch/powerpc/pic/pic_i8259.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/pic/pic_distopenpic.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/pic/pic_mpcsoc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/pic/pic_openpic.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/powerpc/powerpc/bus_dma.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/powerpc/powerpc/bus_space.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/powerpc/ofw_machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/powerpc/powerpc/pmap_subr.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/powerpc/ibm4xx/pic_uic.c
diff -u src/sys/arch/powerpc/ibm4xx/pic_uic.c:1.2 src/sys/arch/powerpc/ibm4xx/pic_uic.c:1.3
--- src/sys/arch/powerpc/ibm4xx/pic_uic.c:1.2 Tue Dec 13 10:55:45 2011
+++ src/sys/arch/powerpc/ibm4xx/pic_uic.c Wed Feb 1 09:54:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_uic.c,v 1.2 2011/12/13 10:55:45 kiyohara Exp $ */
+/* $NetBSD: pic_uic.c,v 1.3 2012/02/01 09:54:02 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,10 +36,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_uic.c,v 1.2 2011/12/13 10:55:45 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_uic.c,v 1.3 2012/02/01 09:54:02 matt Exp $");
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/evcnt.h>
#include <sys/cpu.h>
Index: src/sys/arch/powerpc/isa/isadma_machdep.c
diff -u src/sys/arch/powerpc/isa/isadma_machdep.c:1.7 src/sys/arch/powerpc/isa/isadma_machdep.c:1.8
--- src/sys/arch/powerpc/isa/isadma_machdep.c:1.7 Fri Jul 1 18:59:19 2011
+++ src/sys/arch/powerpc/isa/isadma_machdep.c Wed Feb 1 09:54:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_machdep.c,v 1.7 2011/07/01 18:59:19 dyoung Exp $ */
+/* $NetBSD: isadma_machdep.c,v 1.8 2012/02/01 09:54:02 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.7 2011/07/01 18:59:19 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.8 2012/02/01 09:54:02 matt Exp $");
#define ISA_DMA_STATS
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: isadma_machd
#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>
@@ -182,7 +182,7 @@ _isa_bus_dmamap_create(bus_dma_tag_t t,
map = *dmamp;
map->_dm_cookie = NULL;
- cookiesize = sizeof(struct powerpc_isa_dma_cookie);
+ cookiesize = sizeof(*cookie);
/*
* ISA only has 24-bits of address space. This means
@@ -221,8 +221,8 @@ _isa_bus_dmamap_create(bus_dma_tag_t t,
/*
* Allocate our cookie.
*/
- if ((cookiestore = malloc(cookiesize, M_DMAMAP,
- (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL) {
+ if ((cookiestore = kmem_intr_alloc(cookiesize,
+ (flags & BUS_DMA_NOWAIT) ? KM_NOSLEEP : KM_SLEEP)) == NULL) {
error = ENOMEM;
goto out;
}
@@ -265,7 +265,11 @@ _isa_bus_dmamap_destroy(bus_dma_tag_t t,
if (cookie->id_flags & ID_HAS_BOUNCE)
_isa_dma_free_bouncebuf(t, map);
- free(cookie, M_DMAMAP);
+ size_t cookiesize = sizeof(*cookie);
+ if (cookie->id_flags & ID_MIGHT_NEED_BOUNCE)
+ cookiesize += (sizeof(bus_dma_segment_t) * map->_dm_segcnt);
+
+ kmem_intr_free(cookie, cookiesize);
_bus_dmamap_destroy(t, map);
}
Index: src/sys/arch/powerpc/isa/isapnp_machdep.c
diff -u src/sys/arch/powerpc/isa/isapnp_machdep.c:1.5 src/sys/arch/powerpc/isa/isapnp_machdep.c:1.6
--- src/sys/arch/powerpc/isa/isapnp_machdep.c:1.5 Fri Jul 1 18:59:19 2011
+++ src/sys/arch/powerpc/isa/isapnp_machdep.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: isapnp_machdep.c,v 1.5 2011/07/01 18:59:19 dyoung Exp $ */
+/* $NetBSD: isapnp_machdep.c,v 1.6 2012/02/01 09:54:03 matt Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -73,13 +73,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.5 2011/07/01 18:59:19 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnp_machdep.c,v 1.6 2012/02/01 09:54:03 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
-
#include <sys/bus.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/powerpc/marvell/pic_discovery.c
diff -u src/sys/arch/powerpc/marvell/pic_discovery.c:1.6 src/sys/arch/powerpc/marvell/pic_discovery.c:1.7
--- src/sys/arch/powerpc/marvell/pic_discovery.c:1.6 Mon Jan 30 23:31:28 2012
+++ src/sys/arch/powerpc/marvell/pic_discovery.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_discovery.c,v 1.6 2012/01/30 23:31:28 matt Exp $ */
+/* $NetBSD: pic_discovery.c,v 1.7 2012/02/01 09:54:03 matt Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -38,11 +38,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_discovery.c,v 1.6 2012/01/30 23:31:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_discovery.c,v 1.7 2012/02/01 09:54:03 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/intr.h>
#include <powerpc/pic/picvar.h>
@@ -90,8 +90,7 @@ setup_discovery_pic(void)
struct discovery_pic_ops *discovery;
struct pic_ops *pic;
- discovery =
- malloc(sizeof(struct discovery_pic_ops), M_DEVBUF, M_NOWAIT);
+ discovery = kmem_alloc(sizeof(*discovery), KM_SLEEP);
KASSERT(discovery != NULL);
pic = &discovery->pic;
@@ -166,8 +165,7 @@ setup_discovery_gpp_pic(void *discovery,
struct discovery_gpp_pic_ops *discovery_gpp;
struct pic_ops *pic;
- discovery_gpp =
- malloc(sizeof(struct discovery_gpp_pic_ops), M_DEVBUF, M_NOWAIT);
+ discovery_gpp = kmem_alloc(sizeof(*discovery_gpp), KM_SLEEP);
KASSERT(discovery_gpp != NULL);
pic = &discovery_gpp->pic;
Index: src/sys/arch/powerpc/oea/cpu_subr.c
diff -u src/sys/arch/powerpc/oea/cpu_subr.c:1.72 src/sys/arch/powerpc/oea/cpu_subr.c:1.73
--- src/sys/arch/powerpc/oea/cpu_subr.c:1.72 Wed Feb 1 05:25:57 2012
+++ src/sys/arch/powerpc/oea/cpu_subr.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_subr.c,v 1.72 2012/02/01 05:25:57 matt Exp $ */
+/* $NetBSD: cpu_subr.c,v 1.73 2012/02/01 09:54:03 matt Exp $ */
/*-
* Copyright (c) 2001 Matt Thomas.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.72 2012/02/01 05:25:57 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.73 2012/02/01 09:54:03 matt Exp $");
#include "opt_ppcparam.h"
#include "opt_multiprocessor.h"
@@ -46,7 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v
#include <sys/device.h>
#include <sys/types.h>
#include <sys/lwp.h>
-#include <sys/malloc.h>
#include <sys/xcall.h>
#include <uvm/uvm.h>
Index: src/sys/arch/powerpc/oea/oea_machdep.c
diff -u src/sys/arch/powerpc/oea/oea_machdep.c:1.61 src/sys/arch/powerpc/oea/oea_machdep.c:1.62
--- src/sys/arch/powerpc/oea/oea_machdep.c:1.61 Wed Feb 1 05:25:57 2012
+++ src/sys/arch/powerpc/oea/oea_machdep.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: oea_machdep.c,v 1.61 2012/02/01 05:25:57 matt Exp $ */
+/* $NetBSD: oea_machdep.c,v 1.62 2012/02/01 09:54:03 matt Exp $ */
/*
* Copyright (C) 2002 Matt Thomas
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.61 2012/02/01 05:25:57 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.62 2012/02/01 09:54:03 matt Exp $");
#include "opt_ppcarch.h"
#include "opt_compat_netbsd.h"
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: oea_machdep.
#include <sys/boot_flag.h>
#include <sys/exec.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/mount.h>
#include <sys/msgbuf.h>
Index: src/sys/arch/powerpc/oea/ofw_rascons.c
diff -u src/sys/arch/powerpc/oea/ofw_rascons.c:1.7 src/sys/arch/powerpc/oea/ofw_rascons.c:1.8
--- src/sys/arch/powerpc/oea/ofw_rascons.c:1.7 Wed Feb 1 05:25:57 2012
+++ src/sys/arch/powerpc/oea/ofw_rascons.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_rascons.c,v 1.7 2012/02/01 05:25:57 matt Exp $ */
+/* $NetBSD: ofw_rascons.c,v 1.8 2012/02/01 09:54:03 matt Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,32 +28,32 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_rascons.c,v 1.7 2012/02/01 05:25:57 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_rascons.c,v 1.8 2012/02/01 09:54:03 matt Exp $");
+
+#include "wsdisplay.h"
#include <sys/param.h>
#include <sys/buf.h>
+#include <sys/bus.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/systm.h>
-#include <powerpc/oea/bat.h>
#include <dev/ofw/openfirm.h>
#include <uvm/uvm_extern.h>
-#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsdisplayvar.h>
#include <dev/rasops/rasops.h>
-#include <dev/wsfont/wsfont.h>
#include <dev/wscons/wsdisplay_vconsvar.h>
+#include <dev/wsfont/wsfont.h>
+#include <powerpc/oea/bat.h>
#include <powerpc/oea/ofw_rasconsvar.h>
-#include "wsdisplay.h"
/* we need a wsdisplay to do anything halfway useful */
#if NWSDISPLAY > 0
Index: src/sys/arch/powerpc/oea/pmap.c
diff -u src/sys/arch/powerpc/oea/pmap.c:1.83 src/sys/arch/powerpc/oea/pmap.c:1.84
--- src/sys/arch/powerpc/oea/pmap.c:1.83 Wed Feb 1 05:25:57 2012
+++ src/sys/arch/powerpc/oea/pmap.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.83 2012/02/01 05:25:57 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.84 2012/02/01 09:54:03 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.83 2012/02/01 05:25:57 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.84 2012/02/01 09:54:03 matt Exp $");
#define PMAP_NOOPNAMES
@@ -73,7 +73,6 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.8
#include "opt_pmap.h"
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/proc.h>
#include <sys/pool.h>
#include <sys/queue.h>
@@ -1148,6 +1147,7 @@ pmap_create(void)
pmap_t pm;
pm = pool_get(&pmap_pool, PR_WAITOK);
+ KASSERT((vaddr_t)pm < VM_MIN_KERNEL_ADDRESS);
memset((void *)pm, 0, sizeof *pm);
pmap_pinit(pm);
@@ -1613,6 +1613,7 @@ pmap_pvo_enter(pmap_t pm, struct pool *p
pmap_pvo_free(pvo);
}
pvo = pool_get(pl, poolflags);
+ KASSERT((vaddr_t)pvo < VM_MIN_KERNEL_ADDRESS);
#ifdef DEBUG
/*
Index: src/sys/arch/powerpc/oea/prep_machdep.c
diff -u src/sys/arch/powerpc/oea/prep_machdep.c:1.8 src/sys/arch/powerpc/oea/prep_machdep.c:1.9
--- src/sys/arch/powerpc/oea/prep_machdep.c:1.8 Sun Aug 7 14:47:05 2011
+++ src/sys/arch/powerpc/oea/prep_machdep.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: prep_machdep.c,v 1.8 2011/08/07 14:47:05 kiyohara Exp $ */
+/* $NetBSD: prep_machdep.c,v 1.9 2012/02/01 09:54:03 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -37,14 +37,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: prep_machdep.c,v 1.8 2011/08/07 14:47:05 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: prep_machdep.c,v 1.9 2012/02/01 09:54:03 matt Exp $");
#include "opt_modular.h"
#include <sys/param.h>
#include <sys/extent.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/reboot.h>
#include <sys/ksyms.h>
Index: src/sys/arch/powerpc/pci/pci_machdep_common.c
diff -u src/sys/arch/powerpc/pci/pci_machdep_common.c:1.14 src/sys/arch/powerpc/pci/pci_machdep_common.c:1.15
--- src/sys/arch/powerpc/pci/pci_machdep_common.c:1.14 Wed Aug 17 18:52:01 2011
+++ src/sys/arch/powerpc/pci/pci_machdep_common.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep_common.c,v 1.14 2011/08/17 18:52:01 matt Exp $ */
+/* $NetBSD: pci_machdep_common.c,v 1.15 2012/02/01 09:54:03 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep_common.c,v 1.14 2011/08/17 18:52:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep_common.c,v 1.15 2012/02/01 09:54:03 matt Exp $");
#define _POWERPC_BUS_DMA_PRIVATE
@@ -47,7 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep_
#include <sys/errno.h>
#include <sys/extent.h>
#include <sys/intr.h>
-#include <sys/malloc.h>
#include <sys/systm.h>
#include <sys/time.h>
Index: src/sys/arch/powerpc/pci/pci_machdep_ofw.c
diff -u src/sys/arch/powerpc/pci/pci_machdep_ofw.c:1.17 src/sys/arch/powerpc/pci/pci_machdep_ofw.c:1.18
--- src/sys/arch/powerpc/pci/pci_machdep_ofw.c:1.17 Wed Jun 22 18:06:34 2011
+++ src/sys/arch/powerpc/pci/pci_machdep_ofw.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep_ofw.c,v 1.17 2011/06/22 18:06:34 matt Exp $ */
+/* $NetBSD: pci_machdep_ofw.c,v 1.18 2012/02/01 09:54:03 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep_ofw.c,v 1.17 2011/06/22 18:06:34 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep_ofw.c,v 1.18 2012/02/01 09:54:03 matt Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep_
#include <sys/systm.h>
#include <sys/errno.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/bus.h>
#include <sys/intr.h>
@@ -518,8 +518,7 @@ genofw_pci_conf_hook(void *v, int bus, i
*/
if (PCI_CLASS(class) == PCI_CLASS_BRIDGE &&
PCI_SUBCLASS(class) == PCI_SUBCLASS_BRIDGE_PCI) {
- pbi = malloc(sizeof(struct genppc_pci_chipset_businfo),
- M_DEVBUF, M_NOWAIT);
+ pbi = kmem_alloc(sizeof(*pbi), KM_SLEEP);
KASSERT(pbi != NULL);
pbi->pbi_properties = prop_dictionary_create();
KASSERT(pbi->pbi_properties != NULL);
@@ -529,7 +528,7 @@ genofw_pci_conf_hook(void *v, int bus, i
aprint_error("Cannot find node for device "
"bus %d dev %d func %d\n", bus, dev, func);
prop_object_release(pbi->pbi_properties);
- free(pbi, M_DEVBUF);
+ kmem_free(pbi, sizeof(*pbi));
return (PCI_CONF_DEFAULT);
}
genofw_setup_pciintr_map((void *)pct, pbi, node);
Index: src/sys/arch/powerpc/pic/i8259_common.c
diff -u src/sys/arch/powerpc/pic/i8259_common.c:1.6 src/sys/arch/powerpc/pic/i8259_common.c:1.7
--- src/sys/arch/powerpc/pic/i8259_common.c:1.6 Mon Jun 20 06:21:45 2011
+++ src/sys/arch/powerpc/pic/i8259_common.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: i8259_common.c,v 1.6 2011/06/20 06:21:45 matt Exp $ */
+/* $NetBSD: i8259_common.c,v 1.7 2012/02/01 09:54:03 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,10 +30,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i8259_common.c,v 1.6 2011/06/20 06:21:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i8259_common.c,v 1.7 2012/02/01 09:54:03 matt Exp $");
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/intr.h>
Index: src/sys/arch/powerpc/pic/ipi_openpic.c
diff -u src/sys/arch/powerpc/pic/ipi_openpic.c:1.6 src/sys/arch/powerpc/pic/ipi_openpic.c:1.7
--- src/sys/arch/powerpc/pic/ipi_openpic.c:1.6 Mon Jun 20 06:21:45 2011
+++ src/sys/arch/powerpc/pic/ipi_openpic.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ipi_openpic.c,v 1.6 2011/06/20 06:21:45 matt Exp $ */
+/* $NetBSD: ipi_openpic.c,v 1.7 2012/02/01 09:54:03 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,11 +29,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipi_openpic.c,v 1.6 2011/06/20 06:21:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipi_openpic.c,v 1.7 2012/02/01 09:54:03 matt Exp $");
#include "opt_multiprocessor.h"
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/atomic.h>
#include <sys/cpu.h>
Index: src/sys/arch/powerpc/pic/pic_prepivr.c
diff -u src/sys/arch/powerpc/pic/pic_prepivr.c:1.6 src/sys/arch/powerpc/pic/pic_prepivr.c:1.7
--- src/sys/arch/powerpc/pic/pic_prepivr.c:1.6 Mon Jun 20 06:21:45 2011
+++ src/sys/arch/powerpc/pic/pic_prepivr.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_prepivr.c,v 1.6 2011/06/20 06:21:45 matt Exp $ */
+/* $NetBSD: pic_prepivr.c,v 1.7 2012/02/01 09:54:03 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,10 +30,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_prepivr.c,v 1.6 2011/06/20 06:21:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_prepivr.c,v 1.7 2012/02/01 09:54:03 matt Exp $");
#include <sys/param.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/kernel.h>
#include <sys/intr.h>
@@ -69,7 +69,7 @@ setup_prepivr(int ivrtype)
struct pic_ops *pic;
uint32_t pivr;
- prepivr = malloc(sizeof(struct i8259_ops), M_DEVBUF, M_NOWAIT);
+ prepivr = kmem_alloc(sizeof(*prepivr), KM_SLEEP);
KASSERT(prepivr != NULL);
pic = &prepivr->pic;
Index: src/sys/arch/powerpc/pic/intr.c
diff -u src/sys/arch/powerpc/pic/intr.c:1.19 src/sys/arch/powerpc/pic/intr.c:1.20
--- src/sys/arch/powerpc/pic/intr.c:1.19 Sat Jan 14 19:35:59 2012
+++ src/sys/arch/powerpc/pic/intr.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.19 2012/01/14 19:35:59 phx Exp $ */
+/* $NetBSD: intr.c,v 1.20 2012/02/01 09:54:03 matt Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.19 2012/01/14 19:35:59 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.20 2012/02/01 09:54:03 matt Exp $");
#include "opt_interrupt.h"
#include "opt_multiprocessor.h"
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.1
#include <sys/param.h>
#include <sys/cpu.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <powerpc/psl.h>
#include <powerpc/pic/picvar.h>
@@ -154,9 +154,9 @@ intr_establish(int hwirq, int type, int
const int virq = mapirq(hwirq);
/* no point in sleeping unless someone can free memory. */
- ih = malloc(sizeof *ih, M_DEVBUF, cold ? M_NOWAIT : M_WAITOK);
+ ih = kmem_intr_alloc(sizeof(*ih), cold ? KM_NOSLEEP : KM_SLEEP);
if (ih == NULL)
- panic("intr_establish: can't malloc handler info");
+ panic("intr_establish: can't allocate handler info");
if (!PIC_VIRQ_LEGAL_P(virq) || type == IST_NONE)
panic("intr_establish: bogus irq (%d) or type (%d)",
@@ -272,7 +272,7 @@ intr_disestablish(void *arg)
*q = ih->ih_next;
else
panic("intr_disestablish: handler not registered");
- free((void *)ih, M_DEVBUF);
+ kmem_intr_free((void *)ih, sizeof(*ih));
/*
* Reset the IPL for this source now that we've removed a handler.
Index: src/sys/arch/powerpc/pic/openpic_common.c
diff -u src/sys/arch/powerpc/pic/openpic_common.c:1.5 src/sys/arch/powerpc/pic/openpic_common.c:1.6
--- src/sys/arch/powerpc/pic/openpic_common.c:1.5 Mon Jun 20 06:21:45 2011
+++ src/sys/arch/powerpc/pic/openpic_common.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: openpic_common.c,v 1.5 2011/06/20 06:21:45 matt Exp $ */
+/* $NetBSD: openpic_common.c,v 1.6 2012/02/01 09:54:03 matt Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,13 +27,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: openpic_common.c,v 1.5 2011/06/20 06:21:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: openpic_common.c,v 1.6 2012/02/01 09:54:03 matt Exp $");
#include "opt_openpic.h"
#include "opt_interrupt.h"
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/powerpc/pic/pic_i8259.c
diff -u src/sys/arch/powerpc/pic/pic_i8259.c:1.5 src/sys/arch/powerpc/pic/pic_i8259.c:1.6
--- src/sys/arch/powerpc/pic/pic_i8259.c:1.5 Mon Jun 20 06:21:45 2011
+++ src/sys/arch/powerpc/pic/pic_i8259.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_i8259.c,v 1.5 2011/06/20 06:21:45 matt Exp $ */
+/* $NetBSD: pic_i8259.c,v 1.6 2012/02/01 09:54:03 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,10 +30,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_i8259.c,v 1.5 2011/06/20 06:21:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_i8259.c,v 1.6 2012/02/01 09:54:03 matt Exp $");
#include <sys/param.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/kernel.h>
#include <sys/intr.h>
@@ -54,7 +54,7 @@ setup_i8259(void)
struct i8259_ops *i8259;
struct pic_ops *pic;
- i8259 = malloc(sizeof(struct i8259_ops), M_DEVBUF, M_NOWAIT);
+ i8259 = kmem_alloc(sizeof(*i8259), KM_SLEEP);
KASSERT(i8259 != NULL);
pic = &i8259->pic;
Index: src/sys/arch/powerpc/pic/pic_distopenpic.c
diff -u src/sys/arch/powerpc/pic/pic_distopenpic.c:1.8 src/sys/arch/powerpc/pic/pic_distopenpic.c:1.9
--- src/sys/arch/powerpc/pic/pic_distopenpic.c:1.8 Sat Jan 14 19:35:59 2012
+++ src/sys/arch/powerpc/pic/pic_distopenpic.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_distopenpic.c,v 1.8 2012/01/14 19:35:59 phx Exp $ */
+/* $NetBSD: pic_distopenpic.c,v 1.9 2012/02/01 09:54:03 matt Exp $ */
/*-
* Copyright (c) 2008 Tim Rightnour
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_distopenpic.c,v 1.8 2012/01/14 19:35:59 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_distopenpic.c,v 1.9 2012/02/01 09:54:03 matt Exp $");
#include "opt_openpic.h"
#include "opt_interrupt.h"
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
+#include <sys/kmem.h>
#include <uvm/uvm_extern.h>
@@ -64,7 +64,7 @@ setup_distributed_openpic(void *addr, in
u_int x;
openpic_base = (void *)addr;
- opicops = malloc(sizeof(struct openpic_ops), M_DEVBUF, M_NOWAIT);
+ opicops = kmem_alloc(sizeof(*opicops), KM_SLEEP);
KASSERT(opicops != NULL);
pic = &opicops->pic;
@@ -73,11 +73,10 @@ setup_distributed_openpic(void *addr, in
panic("Can't handle a distributed openpic with internal ISU");
opicops->nrofisus = nrofisus;
- opicops->isu = malloc(sizeof(volatile unsigned char *) * nrofisus,
- M_DEVBUF, M_NOWAIT);
+ opicops->isu = kmem_alloc(sizeof(volatile u_char *) * nrofisus,
+ KM_SLEEP);
KASSERT(opicops->isu != NULL);
- opicops->irq_per = malloc(sizeof(uint8_t) * nrofisus,
- M_DEVBUF, M_NOWAIT);
+ opicops->irq_per = kmem_alloc(sizeof(uint8_t) * nrofisus, KM_SLEEP);
KASSERT(opicops->irq_per != NULL);
for (irq=0, i=0; i < nrofisus ; i++) {
Index: src/sys/arch/powerpc/pic/pic_mpcsoc.c
diff -u src/sys/arch/powerpc/pic/pic_mpcsoc.c:1.4 src/sys/arch/powerpc/pic/pic_mpcsoc.c:1.5
--- src/sys/arch/powerpc/pic/pic_mpcsoc.c:1.4 Wed Feb 1 02:03:52 2012
+++ src/sys/arch/powerpc/pic/pic_mpcsoc.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_mpcsoc.c,v 1.4 2012/02/01 02:03:52 matt Exp $ */
+/* $NetBSD: pic_mpcsoc.c,v 1.5 2012/02/01 09:54:03 matt Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,10 +27,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_mpcsoc.c,v 1.4 2012/02/01 02:03:52 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_mpcsoc.c,v 1.5 2012/02/01 09:54:03 matt Exp $");
#include <sys/param.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/kernel.h>
#include <uvm/uvm_extern.h>
@@ -89,7 +89,7 @@ setup_mpcpic(void *addr)
u_int x;
openpic_base = addr;
- ops = malloc(sizeof(struct openpic_ops), M_DEVBUF, M_NOWAIT);
+ ops = kmem_alloc(sizeof(*ops), KM_SLEEP);
KASSERT(ops != NULL);
self = &ops->pic;
Index: src/sys/arch/powerpc/pic/pic_openpic.c
diff -u src/sys/arch/powerpc/pic/pic_openpic.c:1.7 src/sys/arch/powerpc/pic/pic_openpic.c:1.8
--- src/sys/arch/powerpc/pic/pic_openpic.c:1.7 Sat Jan 14 19:35:59 2012
+++ src/sys/arch/powerpc/pic/pic_openpic.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_openpic.c,v 1.7 2012/01/14 19:35:59 phx Exp $ */
+/* $NetBSD: pic_openpic.c,v 1.8 2012/02/01 09:54:03 matt Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,10 +27,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_openpic.c,v 1.7 2012/01/14 19:35:59 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_openpic.c,v 1.8 2012/02/01 09:54:03 matt Exp $");
#include <sys/param.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/kernel.h>
#include <uvm/uvm_extern.h>
@@ -55,7 +55,7 @@ setup_openpic(void *addr, int passthroug
u_int x;
openpic_base = (void *)addr;
- opicops = malloc(sizeof(struct openpic_ops), M_DEVBUF, M_NOWAIT);
+ opicops = kmem_alloc(sizeof(*opicops), KM_SLEEP);
KASSERT(opicops != NULL);
pic = &opicops->pic;
Index: src/sys/arch/powerpc/powerpc/bus_dma.c
diff -u src/sys/arch/powerpc/powerpc/bus_dma.c:1.45 src/sys/arch/powerpc/powerpc/bus_dma.c:1.46
--- src/sys/arch/powerpc/powerpc/bus_dma.c:1.45 Mon Jan 30 23:34:15 2012
+++ src/sys/arch/powerpc/powerpc/bus_dma.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.45 2012/01/30 23:34:15 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.46 2012/02/01 09:54:03 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,13 +32,13 @@
#define _POWERPC_BUS_DMA_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.45 2012/01/30 23:34:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.46 2012/02/01 09:54:03 matt 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>
#include <sys/bus.h>
@@ -104,10 +104,9 @@ _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 powerpc_bus_dmamap) +
- (sizeof(bus_dma_segment_t) * (nsegments - 1));
- if ((mapstore = malloc(mapsize, M_DMAMAP,
- (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL)
+ mapsize = sizeof(*map) + sizeof(bus_dma_segment_t [nsegments - 1]);
+ if ((mapstore = kmem_intr_alloc(mapsize,
+ (flags & BUS_DMA_NOWAIT) ? KM_NOSLEEP : KM_SLEEP)) == NULL)
return (ENOMEM);
memset(mapstore, 0, mapsize);
@@ -134,7 +133,9 @@ void
_bus_dmamap_destroy(bus_dma_tag_t t, bus_dmamap_t map)
{
- free(map, M_DMAMAP);
+ size_t mapsize = sizeof(*map)
+ + sizeof(bus_dma_segment_t [map->_dm_segcnt - 1]);
+ kmem_intr_free(map, mapsize);
}
/*
Index: src/sys/arch/powerpc/powerpc/bus_space.c
diff -u src/sys/arch/powerpc/powerpc/bus_space.c:1.31 src/sys/arch/powerpc/powerpc/bus_space.c:1.32
--- src/sys/arch/powerpc/powerpc/bus_space.c:1.31 Wed Feb 1 05:25:58 2012
+++ src/sys/arch/powerpc/powerpc/bus_space.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.31 2012/02/01 05:25:58 matt Exp $ */
+/* $NetBSD: bus_space.c,v 1.32 2012/02/01 09:54:03 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.31 2012/02/01 05:25:58 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.32 2012/02/01 09:54:03 matt Exp $");
#define _POWERPC_BUS_SPACE_PRIVATE
@@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: bus_space.c,
#include <sys/device.h>
#include <sys/endian.h>
#include <sys/extent.h>
-#include <sys/malloc.h>
#include <sys/bus.h>
#include <uvm/uvm.h>
Index: src/sys/arch/powerpc/powerpc/ofw_machdep.c
diff -u src/sys/arch/powerpc/powerpc/ofw_machdep.c:1.18 src/sys/arch/powerpc/powerpc/ofw_machdep.c:1.19
--- src/sys/arch/powerpc/powerpc/ofw_machdep.c:1.18 Thu Mar 27 18:01:08 2008
+++ src/sys/arch/powerpc/powerpc/ofw_machdep.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_machdep.c,v 1.18 2008/03/27 18:01:08 phx Exp $ */
+/* $NetBSD: ofw_machdep.c,v 1.19 2012/02/01 09:54:03 matt Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.18 2008/03/27 18:01:08 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.19 2012/02/01 09:54:03 matt Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: ofw_machdep.
#include <sys/disklabel.h>
#include <sys/fcntl.h>
#include <sys/ioctl.h>
-#include <sys/malloc.h>
#include <sys/stat.h>
#include <sys/systm.h>
Index: src/sys/arch/powerpc/powerpc/pmap_subr.c
diff -u src/sys/arch/powerpc/powerpc/pmap_subr.c:1.26 src/sys/arch/powerpc/powerpc/pmap_subr.c:1.27
--- src/sys/arch/powerpc/powerpc/pmap_subr.c:1.26 Sat Feb 12 18:23:10 2011
+++ src/sys/arch/powerpc/powerpc/pmap_subr.c Wed Feb 1 09:54:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_subr.c,v 1.26 2011/02/12 18:23:10 matt Exp $ */
+/* $NetBSD: pmap_subr.c,v 1.27 2012/02/01 09:54:03 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,13 +29,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_subr.c,v 1.26 2011/02/12 18:23:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_subr.c,v 1.27 2012/02/01 09:54:03 matt Exp $");
#include "opt_multiprocessor.h"
#include "opt_altivec.h"
#include "opt_pmap.h"
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/proc.h>
#include <sys/sched.h>
#include <sys/device.h>
