Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/powerpc Use kmem instead of malloc. Remove unneede...
details: https://anonhg.NetBSD.org/src/rev/a1f0c07f85db
branches: trunk
changeset: 773398:a1f0c07f85db
user: matt <matt%NetBSD.org@localhost>
date: Wed Feb 01 09:54:02 2012 +0000
description:
Use kmem instead of malloc. Remove unneeded <sys/malloc.h> includes.
diffstat:
sys/arch/powerpc/ibm4xx/pic_uic.c | 5 ++---
sys/arch/powerpc/isa/isadma_machdep.c | 18 +++++++++++-------
sys/arch/powerpc/isa/isapnp_machdep.c | 6 ++----
sys/arch/powerpc/marvell/pic_discovery.c | 12 +++++-------
sys/arch/powerpc/oea/cpu_subr.c | 5 ++---
sys/arch/powerpc/oea/oea_machdep.c | 5 ++---
sys/arch/powerpc/oea/ofw_rascons.c | 14 +++++++-------
sys/arch/powerpc/oea/pmap.c | 7 ++++---
sys/arch/powerpc/oea/prep_machdep.c | 5 ++---
sys/arch/powerpc/pci/pci_machdep_common.c | 5 ++---
sys/arch/powerpc/pci/pci_machdep_ofw.c | 11 +++++------
sys/arch/powerpc/pic/i8259_common.c | 5 ++---
sys/arch/powerpc/pic/intr.c | 12 ++++++------
sys/arch/powerpc/pic/ipi_openpic.c | 5 ++---
sys/arch/powerpc/pic/openpic_common.c | 5 ++---
sys/arch/powerpc/pic/pic_distopenpic.c | 15 +++++++--------
sys/arch/powerpc/pic/pic_i8259.c | 8 ++++----
sys/arch/powerpc/pic/pic_mpcsoc.c | 8 ++++----
sys/arch/powerpc/pic/pic_openpic.c | 8 ++++----
sys/arch/powerpc/pic/pic_prepivr.c | 8 ++++----
sys/arch/powerpc/powerpc/bus_dma.c | 17 +++++++++--------
sys/arch/powerpc/powerpc/bus_space.c | 5 ++---
sys/arch/powerpc/powerpc/ofw_machdep.c | 5 ++---
sys/arch/powerpc/powerpc/pmap_subr.c | 5 ++---
24 files changed, 94 insertions(+), 105 deletions(-)
diffs (truncated from 802 to 300 lines):
diff -r ab21d98572fa -r a1f0c07f85db sys/arch/powerpc/ibm4xx/pic_uic.c
--- a/sys/arch/powerpc/ibm4xx/pic_uic.c Wed Feb 01 09:51:00 2012 +0000
+++ b/sys/arch/powerpc/ibm4xx/pic_uic.c Wed Feb 01 09:54:02 2012 +0000
@@ -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>
diff -r ab21d98572fa -r a1f0c07f85db sys/arch/powerpc/isa/isadma_machdep.c
--- a/sys/arch/powerpc/isa/isadma_machdep.c Wed Feb 01 09:51:00 2012 +0000
+++ b/sys/arch/powerpc/isa/isadma_machdep.c Wed Feb 01 09:54:02 2012 +0000
@@ -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 @@
#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 @@
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 @@
/*
* 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 @@
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);
}
diff -r ab21d98572fa -r a1f0c07f85db sys/arch/powerpc/isa/isapnp_machdep.c
--- a/sys/arch/powerpc/isa/isapnp_machdep.c Wed Feb 01 09:51:00 2012 +0000
+++ b/sys/arch/powerpc/isa/isapnp_machdep.c Wed Feb 01 09:54:02 2012 +0000
@@ -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>
diff -r ab21d98572fa -r a1f0c07f85db sys/arch/powerpc/marvell/pic_discovery.c
--- a/sys/arch/powerpc/marvell/pic_discovery.c Wed Feb 01 09:51:00 2012 +0000
+++ b/sys/arch/powerpc/marvell/pic_discovery.c Wed Feb 01 09:54:02 2012 +0000
@@ -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 @@
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 @@
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;
diff -r ab21d98572fa -r a1f0c07f85db sys/arch/powerpc/oea/cpu_subr.c
--- a/sys/arch/powerpc/oea/cpu_subr.c Wed Feb 01 09:51:00 2012 +0000
+++ b/sys/arch/powerpc/oea/cpu_subr.c Wed Feb 01 09:54:02 2012 +0000
@@ -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 @@
#include <sys/device.h>
#include <sys/types.h>
#include <sys/lwp.h>
-#include <sys/malloc.h>
#include <sys/xcall.h>
#include <uvm/uvm.h>
diff -r ab21d98572fa -r a1f0c07f85db sys/arch/powerpc/oea/oea_machdep.c
--- a/sys/arch/powerpc/oea/oea_machdep.c Wed Feb 01 09:51:00 2012 +0000
+++ b/sys/arch/powerpc/oea/oea_machdep.c Wed Feb 01 09:54:02 2012 +0000
@@ -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 @@
#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>
diff -r ab21d98572fa -r a1f0c07f85db sys/arch/powerpc/oea/ofw_rascons.c
--- a/sys/arch/powerpc/oea/ofw_rascons.c Wed Feb 01 09:51:00 2012 +0000
+++ b/sys/arch/powerpc/oea/ofw_rascons.c Wed Feb 01 09:54:02 2012 +0000
@@ -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/wscons/wsdisplay_vconsvar.h>
#include <dev/wsfont/wsfont.h>
-#include <dev/wscons/wsdisplay_vconsvar.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
diff -r ab21d98572fa -r a1f0c07f85db sys/arch/powerpc/oea/pmap.c
--- a/sys/arch/powerpc/oea/pmap.c Wed Feb 01 09:51:00 2012 +0000
+++ b/sys/arch/powerpc/oea/pmap.c Wed Feb 01 09:54:02 2012 +0000
@@ -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 @@
#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_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_free(pvo);
}
pvo = pool_get(pl, poolflags);
+ KASSERT((vaddr_t)pvo < VM_MIN_KERNEL_ADDRESS);
#ifdef DEBUG
/*
diff -r ab21d98572fa -r a1f0c07f85db sys/arch/powerpc/oea/prep_machdep.c
--- a/sys/arch/powerpc/oea/prep_machdep.c Wed Feb 01 09:51:00 2012 +0000
+++ b/sys/arch/powerpc/oea/prep_machdep.c Wed Feb 01 09:54:02 2012 +0000
@@ -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 @@
Home |
Main Index |
Thread Index |
Old Index