Nitpicking and dusting performed on a train. Removes trivial warnings

about unused variables, labels and other lint.

5 files changed, 9 insertions, 23 deletions

diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index 898ba8c..9178d4d 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.87 1998/08/24 08:39:37 dfr Exp $
+ * $Id: vm_fault.c,v 1.88 1998/09/04 08:06:57 dfr Exp $
  */
 
 /*
@@ -183,7 +183,6 @@ vm_fault(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type, int fault_flags)
 	vm_page_t marray[VM_FAULT_READ];
 	int hardfault;
 	int faultcount;
-	struct proc *p = curproc;	/* XXX */
 	struct faultstate fs;
 
 	cnt.v_vm_faults++;	/* needs lock XXX */
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 7dbad01..83132ad 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.136 1998/10/01 20:46:41 jdp Exp $
+ * $Id: vm_map.c,v 1.137 1998/10/13 08:24:43 dg Exp $
  */
 
 /*
@@ -92,8 +92,6 @@
 #include <vm/swap_pager.h>
 #include <vm/vm_zone.h>
 
-static MALLOC_DEFINE(M_VMMAP, "VM map", "VM map structures");
-
 /*
  *	Virtual memory maps provide for the mapping, protection,
  *	and sharing of virtual memory objects.  In addition,
@@ -2754,9 +2752,9 @@ vm_freeze_copyopts(object, froma, toa)
 	vm_object_t object;
 	vm_pindex_t froma, toa;
 {
-	int s, rv;
-	vm_object_t robject, robjectn;
-	vm_pindex_t idx, from, to;
+	int rv;
+	vm_object_t robject;
+	vm_pindex_t idx;
 
 	if ((object == NULL) ||
 		((object->flags & OBJ_OPT) == 0))
@@ -2784,12 +2782,10 @@ vm_freeze_copyopts(object, froma, toa)
 
 		for (idx = 0; idx < robject->size; idx++) {
 
-m_outretry:
 			m_out = vm_page_grab(robject, idx,
 						VM_ALLOC_NORMAL | VM_ALLOC_RETRY);
 
 			if (m_out->valid == 0) {
-m_inretry:
 				m_in = vm_page_grab(object, bo_pindex + idx,
 						VM_ALLOC_NORMAL | VM_ALLOC_RETRY);
 				if (m_in->valid == 0) {
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 3557e9d..0a8d78e 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.131 1998/10/23 05:25:49 dg Exp $
+ * $Id: vm_object.c,v 1.132 1998/10/23 05:43:13 dg Exp $
  */
 
 /*
@@ -294,7 +294,6 @@ void
 vm_object_deallocate(object)
 	vm_object_t object;
 {
-	int s;
 	vm_object_t temp;
 
 	while (object != NULL) {
@@ -520,7 +519,6 @@ vm_object_page_clean(object, start, end, flags)
 	vm_page_t mab[vm_pageout_page_count];
 	vm_page_t ma[vm_pageout_page_count];
 	int curgeneration;
-	struct proc *pproc = curproc;	/* XXX */
 
 	if (object->type != OBJT_VNODE ||
 		(object->flags & OBJ_MIGHTBEDIRTY) == 0)
@@ -776,7 +774,6 @@ vm_object_madvise(object, pindex, count, advise)
 	int count;
 	int advise;
 {
-	int s;
 	vm_pindex_t end, tpindex;
 	vm_object_t tobject;
 	vm_page_t m;
@@ -1298,7 +1295,7 @@ vm_object_page_remove(object, start, end, clean_only)
 {
 	register vm_page_t p, next;
 	unsigned int size;
-	int s, all;
+	int all;
 
 	if (object == NULL)
 		return;
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index 298b9a3..b2225e7 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.108 1998/10/21 11:43:04 dg Exp $
+ *	$Id: vm_page.c,v 1.109 1998/10/21 14:46:41 dg Exp $
  */
 
 /*
@@ -500,7 +500,6 @@ vm_page_lookup(object, pindex)
 	register vm_page_t m;
 	register struct pglist *bucket;
 	int generation;
-	int s;
 
 	/*
 	 * Search the hash table for this object/offset pair
@@ -1001,7 +1000,6 @@ vm_wait()
 
 int
 vm_page_sleep(vm_page_t m, char *msg, char *busy) {
-	vm_object_t object = m->object;
 	int slept = 0;
 	if ((busy && *busy) || (m->flags & PG_BUSY)) {
 		int s;
@@ -1028,8 +1026,6 @@ vm_page_activate(m)
 	register vm_page_t m;
 {
 	int s;
-	vm_page_t np;
-	vm_object_t object;
 
 	s = splvm();
 	if (m->queue != PQ_ACTIVE) {
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index a9e9cfb..5c2a842 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.126 1998/09/04 08:06:57 dfr Exp $
+ * $Id: vm_pageout.c,v 1.127 1998/09/29 17:33:59 abial Exp $
  */
 
 /*
@@ -1221,7 +1221,6 @@ vm_pageout()
 	 * The pageout daemon is never done, so loop forever.
 	 */
 	while (TRUE) {
-		int inactive_target;
 		int error;
 		int s = splvm();
 		if (!vm_pages_needed ||
@@ -1275,7 +1274,6 @@ vm_req_vmdaemon()
 static void
 vm_daemon()
 {
-	vm_object_t object;
 	struct proc *p;
 
 	while (TRUE) {