Last major round (Unless Bruce thinks of somthing :-) of malloc changes.

Distribute all but the most fundamental malloc types.  This time I also
remembered the trick to making things static:  Put "static" in front of
them.

A couple of finer points by:	bde

4 files changed, 14 insertions, 6 deletions

diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index fed57fe..2b9b996 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_map.c,v 1.91 1997/09/21 04:24:20 dyson Exp $
+ * $Id: vm_map.c,v 1.92 1997/10/11 18:31:39 phk Exp $
  */
 
 /*
@@ -93,7 +93,7 @@
 #include <vm/default_pager.h>
 #include <vm/vm_zone.h>
 
-MALLOC_DEFINE(M_VMMAP, "VM map", "VM map structures");
+static MALLOC_DEFINE(M_VMMAP, "VM map", "VM map structures");
 
 /*
  *	Virtual memory maps provide for the mapping, protection,
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index f093a9b..bfc2cc1 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pager.c,v 1.28 1997/08/25 22:15:28 bde Exp $
+ * $Id: vm_pager.c,v 1.29 1997/09/01 03:17:28 bde Exp $
  */
 
 /*
@@ -73,6 +73,7 @@
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/ucred.h>
+#include <sys/malloc.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
@@ -82,6 +83,8 @@
 #include <vm/vm_pager.h>
 #include <vm/vm_extern.h>
 
+MALLOC_DEFINE(M_VMPGDATA, "VM pgdata", "XXX: VM pager private data");
+
 extern struct pagerops defaultpagerops;
 extern struct pagerops swappagerops;
 extern struct pagerops vnodepagerops;
diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h
index a965624..c809865 100644
--- a/sys/vm/vm_pager.h
+++ b/sys/vm/vm_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_pager.h	8.4 (Berkeley) 1/12/94
- * $Id$
+ * $Id: vm_pager.h,v 1.13 1997/02/22 09:48:37 peter Exp $
  */
 
 /*
@@ -75,6 +75,11 @@ struct pagerops {
 #define VM_PAGER_AGAIN	5
 
 #ifdef KERNEL
+
+#ifdef MALLOC_DECLARE
+MALLOC_DECLARE(M_VMPGDATA);
+#endif
+
 extern vm_map_t pager_map;
 extern int pager_map_size;
 
diff --git a/sys/vm/vm_zone.c b/sys/vm/vm_zone.c
index 1c5b6730..94eacc2 100644
--- a/sys/vm/vm_zone.c
+++ b/sys/vm/vm_zone.c
@@ -18,7 +18,7 @@
  * 5. Modifications may be freely made to this file if the above conditions
  *	are met.
  *
- * $Id: vm_zone.c,v 1.8 1997/09/21 11:41:12 peter Exp $
+ * $Id: vm_zone.c,v 1.9 1997/10/11 18:31:40 phk Exp $
  */
 
 #include <sys/param.h>
@@ -35,7 +35,7 @@
 #include <vm/vm_extern.h>
 #include <vm/vm_zone.h>
 
-MALLOC_DEFINE(M_ZONE, "ZONE", "Zone header");
+static MALLOC_DEFINE(M_ZONE, "ZONE", "Zone header");
 
 /*
  * This file comprises a very simple zone allocator.  This is used