Module Name: src
Committed By: rmind
Date: Mon Apr 18 00:26:12 UTC 2011
Modified Files:
src/sys/arch/sparc/sparc: machdep.c trap.c vm_machdep.c
src/sys/kern: kern_proc.c
src/sys/sys: proc.h
Log Message:
Replace malloc with kmem, and remove M_SUBPROC.
To generate a diff of this commit:
cvs rdiff -u -r1.307 -r1.308 src/sys/arch/sparc/sparc/machdep.c
cvs rdiff -u -r1.186 -r1.187 src/sys/arch/sparc/sparc/trap.c
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/sparc/sparc/vm_machdep.c
cvs rdiff -u -r1.174 -r1.175 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.303 -r1.304 src/sys/sys/proc.h
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/sparc/sparc/machdep.c
diff -u src/sys/arch/sparc/sparc/machdep.c:1.307 src/sys/arch/sparc/sparc/machdep.c:1.308
--- src/sys/arch/sparc/sparc/machdep.c:1.307 Fri Mar 4 22:25:28 2011
+++ src/sys/arch/sparc/sparc/machdep.c Mon Apr 18 00:26:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.307 2011/03/04 22:25:28 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.308 2011/04/18 00:26:11 rmind Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.307 2011/03/04 22:25:28 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.308 2011/04/18 00:26:11 rmind Exp $");
#include "opt_compat_netbsd.h"
#include "opt_compat_sunos.h"
@@ -383,7 +383,7 @@
}
l->l_md.md_fpu = NULL;
FPU_UNLOCK(s);
- free((void *)fs, M_SUBPROC);
+ kmem_free(fs, sizeof(struct fpstate));
l->l_md.md_fpstate = NULL;
}
memset((void *)tf, 0, sizeof *tf);
Index: src/sys/arch/sparc/sparc/trap.c
diff -u src/sys/arch/sparc/sparc/trap.c:1.186 src/sys/arch/sparc/sparc/trap.c:1.187
--- src/sys/arch/sparc/sparc/trap.c:1.186 Fri Jan 14 02:06:31 2011
+++ src/sys/arch/sparc/sparc/trap.c Mon Apr 18 00:26:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.186 2011/01/14 02:06:31 rmind Exp $ */
+/* $NetBSD: trap.c,v 1.187 2011/04/18 00:26:12 rmind Exp $ */
/*
* Copyright (c) 1996
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.186 2011/01/14 02:06:31 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.187 2011/04/18 00:26:12 rmind Exp $");
#include "opt_ddb.h"
#include "opt_compat_svr4.h"
@@ -61,7 +61,6 @@
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/kmem.h>
#include <sys/resource.h>
#include <sys/signal.h>
@@ -419,7 +418,7 @@
#endif
if (fs == NULL) {
- fs = malloc(sizeof *fs, M_SUBPROC, M_WAITOK);
+ fs = kmem_alloc(sizeof(struct fpstate), KM_SLEEP);
*fs = initfpstate;
l->l_md.md_fpstate = fs;
}
Index: src/sys/arch/sparc/sparc/vm_machdep.c
diff -u src/sys/arch/sparc/sparc/vm_machdep.c:1.105 src/sys/arch/sparc/sparc/vm_machdep.c:1.106
--- src/sys/arch/sparc/sparc/vm_machdep.c:1.105 Thu Feb 24 04:28:48 2011
+++ src/sys/arch/sparc/sparc/vm_machdep.c Mon Apr 18 00:26:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.105 2011/02/24 04:28:48 joerg Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.106 2011/04/18 00:26:12 rmind Exp $ */
/*
* Copyright (c) 1996
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.105 2011/02/24 04:28:48 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.106 2011/04/18 00:26:12 rmind Exp $");
#include "opt_multiprocessor.h"
@@ -57,11 +57,10 @@
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/core.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/buf.h>
#include <sys/exec.h>
#include <sys/vnode.h>
-#include <sys/simplelock.h>
#include <sys/cpu.h>
#include <uvm/uvm_extern.h>
@@ -220,8 +219,8 @@
struct cpu_info *cpi;
int s;
- l2->l_md.md_fpstate = malloc(sizeof(struct fpstate),
- M_SUBPROC, M_WAITOK);
+ l2->l_md.md_fpstate =
+ kmem_alloc(sizeof(struct fpstate), KM_SLEEP);
FPU_LOCK(s);
if ((cpi = l1->l_md.md_fpu) != NULL) {
@@ -325,7 +324,7 @@
struct fpstate *fs;
if ((fs = l->l_md.md_fpstate) != NULL)
- free((void *)fs, M_SUBPROC);
+ kmem_free(fs, sizeof(struct fpstate));
}
void
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.174 src/sys/kern/kern_proc.c:1.175
--- src/sys/kern/kern_proc.c:1.174 Tue Apr 5 09:02:23 2011
+++ src/sys/kern/kern_proc.c Mon Apr 18 00:26:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.174 2011/04/05 09:02:23 rmind Exp $ */
+/* $NetBSD: kern_proc.c,v 1.175 2011/04/18 00:26:11 rmind Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.174 2011/04/05 09:02:23 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.175 2011/04/18 00:26:11 rmind Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -205,7 +205,6 @@
int cmask = CMASK;
MALLOC_DEFINE(M_EMULDATA, "emuldata", "Per-process emulation data");
-MALLOC_DEFINE(M_SUBPROC, "subproc", "Proc sub-structures");
static int sysctl_doeproc(SYSCTLFN_PROTO);
static int sysctl_kern_proc_args(SYSCTLFN_PROTO);
Index: src/sys/sys/proc.h
diff -u src/sys/sys/proc.h:1.303 src/sys/sys/proc.h:1.304
--- src/sys/sys/proc.h:1.303 Wed Apr 13 08:45:00 2011
+++ src/sys/sys/proc.h Mon Apr 18 00:26:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.303 2011/04/13 08:45:00 mrg Exp $ */
+/* $NetBSD: proc.h,v 1.304 2011/04/18 00:26:11 rmind Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -413,7 +413,6 @@
#ifdef _KERNEL
#include <sys/mallocvar.h>
MALLOC_DECLARE(M_EMULDATA);
-MALLOC_DECLARE(M_SUBPROC); /* XXX - only used by sparc/sparc64 */
/*
* We use process IDs <= PID_MAX until there are > 16k processes.
