Remove prototypes for functions that don't exist anymore (vm_map.h).

Remove a useless argument from vm_map_madvise's interface (vm_map.c,
	vm_map.h, and vm_mmap.c).

Remove a redundant test in vm_uiomove (vm_map.c).

Make two changes to vm_object_coalesce:

1. Determine whether the new range of pages actually overlaps
the existing object's range of pages before calling vm_object_page_remove.
(Prior to this change almost 90% of the calls to vm_object_page_remove
were to remove pages that were beyond the end of the object.)

2. Free any swap space allocated to removed pages.

1 files changed, 2 insertions, 7 deletions

diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index 3f5cba1..bab8912 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -38,7 +38,7 @@
  * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$
  *
  *	@(#)vm_mmap.c	8.4 (Berkeley) 1/12/94
- * $Id: vm_mmap.c,v 1.96 1999/05/06 22:06:45 peter Exp $
+ * $Id: vm_mmap.c,v 1.97 1999/05/14 23:09:34 alc Exp $
  */
 
 /*
@@ -616,8 +616,6 @@ madvise(p, uap)
 	struct proc *p;
 	struct madvise_args *uap;
 {
-	vm_map_t map;
-	pmap_t pmap;
 	vm_offset_t start, end;
 	/*
 	 * Check for illegal addresses.  Watch out for address wrap... Note
@@ -640,10 +638,7 @@ madvise(p, uap)
 	start = trunc_page((vm_offset_t) uap->addr);
 	end = round_page((vm_offset_t) uap->addr + uap->len);
 	
-	map = &p->p_vmspace->vm_map;
-	pmap = vmspace_pmap(p->p_vmspace);
-
-	vm_map_madvise(map, pmap, start, end, uap->behav);
+	vm_map_madvise(&p->p_vmspace->vm_map, start, end, uap->behav);
 
 	return (0);
 }