Kill VM_PAGE_INIT macro as it is only used once and makes the code more

difficult to understand. Got rid of unused vm_page flags.

2 files changed, 15 insertions, 22 deletions

diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index 220dee3..b058a93 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.13 1995/01/09 16:05:51 davidg Exp $
+ *	$Id: vm_page.c,v 1.14 1995/01/10 07:32:48 davidg Exp $
  */
 
 /*
@@ -635,6 +635,7 @@ vm_page_alloc(object, offset, inttime)
 					goto gotpage;
 				}
 			}
+			simple_unlock(&vm_page_queue_free_lock);
 			splx(s);
 			return NULL;
 		}
@@ -650,7 +651,6 @@ vm_page_alloc(object, offset, inttime)
 			}
 			simple_unlock(&vm_page_queue_free_lock);
 			splx(s);
-			/* wakeup((caddr_t) &vm_pages_needed); */
 			return (NULL);
 		}
 	}
@@ -661,7 +661,18 @@ vm_page_alloc(object, offset, inttime)
 gotpage:
 	simple_unlock(&vm_page_queue_free_lock);
 
-	VM_PAGE_INIT(mem, object, offset);
+	mem->flags = PG_BUSY | PG_CLEAN;
+	mem->wire_count = 0;
+	mem->hold_count = 0;
+	mem->act_count = 0;
+	mem->busy = 0;
+	mem->valid = 0;
+	mem->dirty = 0;
+	mem->bmapped = 0;
+
+	/* XXX before splx until vm_page_insert is safe */
+	vm_page_insert(mem, object, offset);
+
 	splx(s);
 
 /*
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index 140c527..3be697c 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.10 1994/11/14 08:19:08 bde Exp $
+ * $Id: vm_page.h,v 1.11 1995/01/09 16:05:52 davidg Exp $
  */
 
 /*
@@ -124,18 +124,14 @@ struct vm_page {
  */
 #define	PG_INACTIVE	0x0001		/* page is in inactive list (P) */
 #define	PG_ACTIVE	0x0002		/* page is in active list (P) */
-#define	PG_LAUNDRY	0x0004		/* page is being cleaned now (P) */
 #define	PG_CLEAN	0x0008		/* page has not been modified */
 #define	PG_BUSY		0x0010		/* page is in transit (O) */
 #define	PG_WANTED	0x0020		/* someone is waiting for page (O) */
 #define	PG_TABLED	0x0040		/* page is in VP table (O) */
 #define	PG_COPYONWRITE	0x0080		/* must copy page before changing (O) */
 #define	PG_FICTITIOUS	0x0100		/* physical page doesn't exist (O) */
-#define	PG_FAKE		0x0200		/* page is placeholder for pagein (O) */
-#define	PG_FILLED	0x0400		/* client flag to set when filled */
 #define	PG_DIRTY	0x0800		/* client flag to set when dirty */
 #define PG_REFERENCED	0x1000		/* page has been referenced */
-#define PG_VMIO		0x2000		/* VMIO flag */
 #define	PG_CACHE	0x4000		/* On VMIO cache */
 #define	PG_FREE		0x8000		/* page is in free list */
 
@@ -216,20 +212,6 @@ extern simple_lock_data_t vm_page_queue_free_lock; /* lock on free page queue */
 #define	vm_page_lock_queues()	simple_lock(&vm_page_queue_lock)
 #define	vm_page_unlock_queues()	simple_unlock(&vm_page_queue_lock)
 
-#define vm_page_set_modified(m)	{ (m)->flags &= ~PG_CLEAN; }
-
-#define	VM_PAGE_INIT(mem, object, offset) { \
-	(mem)->flags = PG_BUSY | PG_CLEAN | PG_FAKE; \
-	vm_page_insert((mem), (object), (offset)); \
-	(mem)->wire_count = 0; \
-	(mem)->hold_count = 0; \
-	(mem)->act_count = 0; \
-	(mem)->busy = 0; \
-	(mem)->valid = 0; \
-	(mem)->dirty = 0; \
-	(mem)->bmapped = 0; \
-}
-
 #if PAGE_SIZE == 4096
 #define VM_PAGE_BITS_ALL 0xff
 #endif