[src/trunk]: src/sys G/C M_EMULDATA

[rmind <rmind%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9e4ae2cfc0d4
branches:  trunk
changeset: 764549:9e4ae2cfc0d4
user:      rmind <rmind%NetBSD.org@localhost>
date:      Wed Apr 27 00:36:47 2011 +0000

description:
G/C M_EMULDATA

diffstat:

 sys/kern/kern_pmf.c   |  5 +++--
 sys/kern/kern_proc.c  |  6 ++----
 sys/netbt/bluetooth.h |  3 ++-
 sys/sys/proc.h        |  4 +---
 4 files changed, 8 insertions(+), 10 deletions(-)

diffs (88 lines):

diff -r 141601ccaf70 -r 9e4ae2cfc0d4 sys/kern/kern_pmf.c
--- a/sys/kern/kern_pmf.c       Wed Apr 27 00:35:52 2011 +0000
+++ b/sys/kern/kern_pmf.c       Wed Apr 27 00:36:47 2011 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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;
diff -r 141601ccaf70 -r 9e4ae2cfc0d4 sys/kern/kern_proc.c
--- a/sys/kern/kern_proc.c      Wed Apr 27 00:35:52 2011 +0000
+++ b/sys/kern/kern_proc.c      Wed Apr 27 00:36:47 2011 +0000
@@ -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);
diff -r 141601ccaf70 -r 9e4ae2cfc0d4 sys/netbt/bluetooth.h
--- a/sys/netbt/bluetooth.h     Wed Apr 27 00:35:52 2011 +0000
+++ b/sys/netbt/bluetooth.h     Wed Apr 27 00:36:47 2011 +0000
@@ -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);
 
 /*
diff -r 141601ccaf70 -r 9e4ae2cfc0d4 sys/sys/proc.h
--- a/sys/sys/proc.h    Wed Apr 27 00:35:52 2011 +0000
+++ b/sys/sys/proc.h    Wed Apr 27 00:36:47 2011 +0000
@@ -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.