8 files changed, 35 insertions, 34 deletions
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index b464b00..c4e78b9 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -39,7 +39,7 @@
  * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$
  *
  *	@(#)swap_pager.c	8.9 (Berkeley) 3/21/94
- * $Id: swap_pager.c,v 1.86 1998/02/04 22:33:41 eivind Exp $
+ * $Id: swap_pager.c,v 1.87 1998/02/06 12:14:21 eivind Exp $
  */
 
 /*
@@ -110,7 +110,7 @@ static struct swpclean swap_pager_inuse;
 
 /* list of free pager clean structs */
 static struct swpclean swap_pager_free;
-int swap_pager_free_count;
+static int swap_pager_free_count;
 
 /* list of "named" anon region objects */
 static struct pagerlst swap_pager_object_list;
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index ea3080c..bb352bc 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -66,7 +66,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_fault.c,v 1.78 1998/02/04 22:33:43 eivind Exp $
+ * $Id: vm_fault.c,v 1.79 1998/02/06 12:14:22 eivind Exp $
  */
 
 /*
@@ -94,7 +94,8 @@
 #include <vm/vnode_pager.h>
 #include <vm/vm_extern.h>
 
-int vm_fault_additional_pages __P((vm_page_t, int, int, vm_page_t *, int *));
+static int vm_fault_additional_pages __P((vm_page_t, int,
+					  int, vm_page_t *, int *));
 
 #define VM_FAULT_READ_AHEAD 8
 #define VM_FAULT_READ_BEHIND 7
@@ -1003,7 +1004,7 @@ vm_fault_copy_entry(dst_map, src_map, dst_entry, src_entry)
  * Return value:
  *  number of pages in marray
  */
-int
+static int
 vm_fault_additional_pages(m, rbehind, rahead, marray, reqpage)
 	vm_page_t m;
 	int rbehind;
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index e98b9c3..8bb9490 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -59,7 +59,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_glue.c,v 1.72 1998/02/05 03:32:38 dyson Exp $
+ * $Id: vm_glue.c,v 1.73 1998/02/06 12:14:22 eivind Exp $
  */
 
 #include "opt_rlimit.h"
@@ -377,7 +377,7 @@ loop:
 /*
  * Swap_idle_threshold1 is the guaranteed swapped in time for a process
  */
-int swap_idle_threshold1 = 2;
+static int swap_idle_threshold1 = 2;
 SYSCTL_INT(_vm, OID_AUTO, swap_idle_threshold1,
 	CTLFLAG_RW, &swap_idle_threshold1, 0, "");
 
@@ -385,7 +385,7 @@ SYSCTL_INT(_vm, OID_AUTO, swap_idle_threshold1,
  * Swap_idle_threshold2 is the time that a process can be idle before
  * it will be swapped out, if idle swapping is enabled.
  */
-int swap_idle_threshold2 = 10;
+static int swap_idle_threshold2 = 10;
 SYSCTL_INT(_vm, OID_AUTO, swap_idle_threshold2,
 	CTLFLAG_RW, &swap_idle_threshold2, 0, "");
 
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index f0941df..99231f8 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.112 1998/02/06 12:14:24 eivind Exp $
+ * $Id: vm_map.c,v 1.113 1998/02/08 14:55:13 dyson Exp $
  */
 
 /*
@@ -161,9 +161,9 @@ static struct vm_zone kmapentzone_store, mapentzone_store, mapzone_store;
 static vm_zone_t mapentzone, kmapentzone, mapzone, vmspace_zone;
 static struct vm_object kmapentobj, mapentobj, mapobj;
 #define MAP_ENTRY_INIT	128
-struct vm_map_entry map_entry_init[MAX_MAPENT];
-struct vm_map_entry kmap_entry_init[MAX_KMAPENT];
-struct vm_map map_init[MAX_KMAP];
+static struct vm_map_entry map_entry_init[MAX_MAPENT];
+static struct vm_map_entry kmap_entry_init[MAX_KMAPENT];
+static struct vm_map map_init[MAX_KMAP];
 
 static void _vm_map_clip_end __P((vm_map_t, vm_map_entry_t, vm_offset_t));
 static void _vm_map_clip_start __P((vm_map_t, vm_map_entry_t, vm_offset_t));
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 2eb01ef..22b3f7a 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_object.c,v 1.111 1998/02/05 03:32:44 dyson Exp $
+ * $Id: vm_object.c,v 1.112 1998/02/06 12:14:26 eivind Exp $
  */
 
 /*
@@ -120,7 +120,7 @@ static void vm_object_dispose __P((vm_object_t));
  */
 
 struct object_q vm_object_list;
-struct simplelock vm_object_list_lock;
+static struct simplelock vm_object_list_lock;
 static long vm_object_count;		/* count of all objects */
 vm_object_t kernel_object;
 vm_object_t kmem_object;
@@ -134,7 +134,7 @@ static int next_index;
 static vm_zone_t obj_zone;
 static struct vm_zone obj_zone_store;
 #define VM_OBJECTS_INIT 256
-struct vm_object vm_objects_init[VM_OBJECTS_INIT];
+static struct vm_object vm_objects_init[VM_OBJECTS_INIT];
 
 void
 _vm_object_allocate(type, size, object)
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index 439c517..c9edfd8 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_page.c	7.4 (Berkeley) 5/7/91
- *	$Id: vm_page.c,v 1.91 1998/02/05 03:32:46 dyson Exp $
+ *	$Id: vm_page.c,v 1.92 1998/02/06 12:14:27 eivind Exp $
  */
 
 /*
@@ -105,10 +105,10 @@ struct pglist vm_page_queue_active = {0};
 struct pglist vm_page_queue_inactive = {0};
 struct pglist vm_page_queue_cache[PQ_L2_SIZE] = {0};
 
-int no_queue=0;
+static int no_queue=0;
 
 struct vpgqueues vm_page_queues[PQ_COUNT] = {0};
-int pqcnt[PQ_COUNT] = {0};
+static int pqcnt[PQ_COUNT] = {0};
 
 static void
 vm_page_queue_init(void) {
@@ -144,7 +144,7 @@ vm_page_queue_init(void) {
 }
 
 vm_page_t vm_page_array = 0;
-int vm_page_array_size = 0;
+static int vm_page_array_size = 0;
 long first_page = 0;
 static long last_page;
 static vm_size_t page_mask;
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index ba87c3c..97ee2e3 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -65,7 +65,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pageout.c,v 1.112 1998/02/05 03:32:48 dyson Exp $
+ * $Id: vm_pageout.c,v 1.113 1998/02/06 12:14:28 eivind Exp $
  */
 
 /*
@@ -138,19 +138,19 @@ static int vm_daemon_needed;
 extern int nswiodone;
 extern int vm_swap_size;
 extern int vfs_update_wakeup;
-int vm_pageout_stats_max=0, vm_pageout_stats_interval = 0;
-int vm_pageout_full_stats_interval = 0;
-int vm_pageout_stats_free_max=0, vm_pageout_algorithm_lru=0;
-int defer_swap_pageouts=0;
-int disable_swap_pageouts=0;
+static int vm_pageout_stats_max=0, vm_pageout_stats_interval = 0;
+static int vm_pageout_full_stats_interval = 0;
+static int vm_pageout_stats_free_max=0, vm_pageout_algorithm_lru=0;
+static int defer_swap_pageouts=0;
+static int disable_swap_pageouts=0;
 
-int max_page_launder=100;
+static int max_page_launder=100;
 #if defined(NO_SWAPPING)
-int vm_swap_enabled=0;
-int vm_swap_idle_enabled=0;
+static int vm_swap_enabled=0;
+static int vm_swap_idle_enabled=0;
 #else
-int vm_swap_enabled=1;
-int vm_swap_idle_enabled=0;
+static int vm_swap_enabled=1;
+static int vm_swap_idle_enabled=0;
 #endif
 
 SYSCTL_INT(_vm, VM_PAGEOUT_ALGORITHM, pageout_algorithm,
diff --git a/sys/vm/vm_zone.c b/sys/vm/vm_zone.c
index 6c1d5ec..7f4c5d0 100644
--- a/sys/vm/vm_zone.c
+++ b/sys/vm/vm_zone.c
@@ -11,7 +11,7 @@
  * 2. Absolutely no warranty of function or purpose is made by the author
  *	John S. Dyson.
  *
- * $Id: vm_zone.c,v 1.16 1998/02/04 22:33:58 eivind Exp $
+ * $Id: vm_zone.c,v 1.17 1998/02/06 12:14:29 eivind Exp $
  */
 
 #include <sys/param.h>
@@ -49,8 +49,8 @@ static MALLOC_DEFINE(M_ZONE, "ZONE", "Zone header");
  * zalloci, zfreei, are the interrupt/lock safe allocation/free routines.
  */
 
-struct vm_zone *zlist;
-int sysctl_vm_zone SYSCTL_HANDLER_ARGS;
+static struct vm_zone *zlist;
+static int sysctl_vm_zone SYSCTL_HANDLER_ARGS;
 
 /*
  * Create a zone, but don't allocate the zone structure.  If the
@@ -363,7 +363,7 @@ _zget(vm_zone_t z)
 	return item;
 }
 
-int
+static int
 sysctl_vm_zone SYSCTL_HANDLER_ARGS
 {
 	int error=0;