Backed out the recent changes/enhancements to the VM code. The

problem with the 'shell scripts' was found, but there was a 'strange'
problem found with a 486 laptop that we could not find.  This commit
backs the code back to 25-jul, and will be re-entered after the snapshot
in smaller (more easily tested) chunks.

1 files changed, 5 insertions, 5 deletions

diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index 1680d4d..921aa31 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_page.h,v 1.29 1996/06/26 05:39:25 dyson Exp $
+ * $Id: vm_page.h,v 1.30 1996/07/27 03:24:06 dyson Exp $
  */
 
 /*
@@ -220,7 +220,6 @@ extern vm_offset_t last_phys_addr;	/* physical address for last_page */
 				(m)->flags &= ~PG_BUSY; \
 				if ((m)->flags & PG_WANTED) { \
 					(m)->flags &= ~PG_WANTED; \
-					(m)->flags |= PG_REFERENCED; \
 					wakeup((caddr_t) (m)); \
 				} \
 			}
@@ -252,7 +251,8 @@ void vm_page_rename __P((vm_page_t, vm_object_t, vm_pindex_t));
 vm_offset_t vm_page_startup __P((vm_offset_t, vm_offset_t, vm_offset_t));
 void vm_page_unwire __P((vm_page_t));
 void vm_page_wire __P((vm_page_t));
-void vm_page_unqueue __P((vm_page_t, int));
+void vm_page_unqueue __P((vm_page_t));
+void vm_page_unqueue_nowakeup __P((vm_page_t));
 void vm_page_set_validclean __P((vm_page_t, int, int));
 void vm_page_set_invalid __P((vm_page_t, int, int));
 static __inline boolean_t vm_page_zero_fill __P((vm_page_t));
@@ -292,11 +292,11 @@ vm_page_protect(vm_page_t mem, int prot)
 {
 	if (prot == VM_PROT_NONE) {
 		if (mem->flags & (PG_WRITEABLE|PG_MAPPED)) {
-			pmap_page_protect(mem, prot);
+			pmap_page_protect(VM_PAGE_TO_PHYS(mem), prot);
 			mem->flags &= ~(PG_WRITEABLE|PG_MAPPED);
 		}
 	} else if ((prot == VM_PROT_READ) && (mem->flags & PG_WRITEABLE)) {
-		pmap_page_protect(mem, prot);
+		pmap_page_protect(VM_PAGE_TO_PHYS(mem), prot);
 		mem->flags &= ~PG_WRITEABLE;
 	}
 }