Module Name: src
Committed By: rmind
Date: Wed Apr 27 00:36:48 UTC 2011
Modified Files:
src/sys/kern: kern_pmf.c kern_proc.c
src/sys/netbt: bluetooth.h
src/sys/sys: proc.h
Log Message:
G/C M_EMULDATA
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/kern/kern_pmf.c
cvs rdiff -u -r1.175 -r1.176 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.10 -r1.11 src/sys/netbt/bluetooth.h
cvs rdiff -u -r1.304 -r1.305 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/kern/kern_pmf.c
diff -u src/sys/kern/kern_pmf.c:1.33 src/sys/kern/kern_pmf.c:1.34
--- src/sys/kern/kern_pmf.c:1.33 Wed Feb 24 22:38:09 2010
+++ src/sys/kern/kern_pmf.c Wed Apr 27 00:36:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_pmf.c,v 1.33 2010/02/24 22:38:09 dyoung Exp $ */
+/* $NetBSD: kern_pmf.c,v 1.34 2011/04/27 00:36:47 rmind Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_pmf.c,v 1.33 2010/02/24 22:38:09 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_pmf.c,v 1.34 2011/04/27 00:36:47 rmind Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -82,6 +82,7 @@
/* #define PMF_DEBUG */
+#include <sys/mallocvar.h>
MALLOC_DEFINE(M_PMF, "pmf", "device pmf messaging memory");
static prop_dictionary_t pmf_platform = NULL;
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.175 src/sys/kern/kern_proc.c:1.176
--- src/sys/kern/kern_proc.c:1.175 Mon Apr 18 00:26:11 2011
+++ src/sys/kern/kern_proc.c Wed Apr 27 00:36:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.175 2011/04/18 00:26:11 rmind Exp $ */
+/* $NetBSD: kern_proc.c,v 1.176 2011/04/27 00:36:47 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.175 2011/04/18 00:26:11 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.176 2011/04/27 00:36:47 rmind Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -204,8 +204,6 @@
int maxuprc = MAXUPRC;
int cmask = CMASK;
-MALLOC_DEFINE(M_EMULDATA, "emuldata", "Per-process emulation data");
-
static int sysctl_doeproc(SYSCTLFN_PROTO);
static int sysctl_kern_proc_args(SYSCTLFN_PROTO);
static void fill_kproc2(struct proc *, struct kinfo_proc2 *, bool);
Index: src/sys/netbt/bluetooth.h
diff -u src/sys/netbt/bluetooth.h:1.10 src/sys/netbt/bluetooth.h:1.11
--- src/sys/netbt/bluetooth.h:1.10 Wed Mar 16 21:35:30 2011
+++ src/sys/netbt/bluetooth.h Wed Apr 27 00:36:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bluetooth.h,v 1.10 2011/03/16 21:35:30 plunky Exp $ */
+/* $NetBSD: bluetooth.h,v 1.11 2011/04/27 00:36:48 rmind Exp $ */
/*-
* Copyright (c) 2005 Iain Hibbert.
@@ -103,6 +103,7 @@
#ifdef _KERNEL
+#include <sys/mallocvar.h>
MALLOC_DECLARE(M_BLUETOOTH);
/*
Index: src/sys/sys/proc.h
diff -u src/sys/sys/proc.h:1.304 src/sys/sys/proc.h:1.305
--- src/sys/sys/proc.h:1.304 Mon Apr 18 00:26:11 2011
+++ src/sys/sys/proc.h Wed Apr 27 00:36:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.304 2011/04/18 00:26:11 rmind Exp $ */
+/* $NetBSD: proc.h,v 1.305 2011/04/27 00:36:48 rmind Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -411,8 +411,6 @@
};
#ifdef _KERNEL
-#include <sys/mallocvar.h>
-MALLOC_DECLARE(M_EMULDATA);
/*
* We use process IDs <= PID_MAX until there are > 16k processes.
