add some struct members that uvm uses

2 files changed, 14 insertions, 5 deletions

diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
index 63ca52ac0db..a7555693d1c 100644
--- a/sys/vm/vm_map.h
+++ b/sys/vm/vm_map.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_map.h,v 1.8 1998/03/01 00:38:12 niklas Exp $	*/
+/*	$OpenBSD: vm_map.h,v 1.9 1999/02/26 01:48:51 art Exp $	*/
 /*	$NetBSD: vm_map.h,v 1.11 1995/03/26 20:39:10 jtc Exp $	*/
 
 /* 
@@ -93,11 +93,13 @@
  */
 
 union vm_map_object {
-	struct vm_object	*vm_object;	/* object object */
-	struct vm_map		*share_map;	/* share map */
-	struct vm_map		*sub_map;	/* belongs to another map */
 #ifdef UVM
 	struct uvm_object	*uvm_obj;	/* UVM OBJECT */
+	struct vm_map		*sub_map;	/* belongs to another map */
+#else
+	struct vm_object	*vm_object;	/* object object */
+	struct vm_map		*sub_map;	/* belongs to another map */
+	struct vm_map		*share_map;	/* share map */
 #endif /* UVM */
 };
 
@@ -152,7 +154,9 @@ struct vm_map {
 	struct vm_map_entry	header;		/* List of entries */
 	int			nentries;	/* Number of entries */
 	vm_size_t		size;		/* virtual size */
+#ifndef UVM
 	boolean_t		is_main_map;	/* Am I a main map? */
+#endif
 	int			ref_count;	/* Reference count */
 	simple_lock_data_t	ref_lock;	/* Lock for ref_count field */
 	vm_map_entry_t		hint;		/* hint for quick lookups */
@@ -164,6 +168,7 @@ struct vm_map {
 #define max_offset		header.end
 };
 
+#ifndef UVM	/* version handled elsewhere in uvm */
 /*
  *	Map versions are used to validate a previous lookup attempt.
  *
@@ -178,6 +183,7 @@ typedef struct {
 	vm_map_t	share_map;
 	int		share_timestamp;
 } vm_map_version_t;
+#endif /* UVM */
 
 /*
  *	Macros:		vm_map_lock, etc.
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index 0a0de773827..0615a192945 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_page.h,v 1.7 1999/02/19 02:54:38 deraadt Exp $	*/
+/*	$OpenBSD: vm_page.h,v 1.8 1999/02/26 01:48:51 art Exp $	*/
 /*	$NetBSD: vm_page.h,v 1.24 1998/02/10 14:09:03 mrg Exp $	*/
 
 /* 
@@ -240,6 +240,9 @@ struct vm_physseg {
 	vm_offset_t end;		/* (PF# of last page in segment) + 1 */
 	vm_offset_t avail_start;	/* PF# of first free page in segment */
 	vm_offset_t avail_end;		/* (PF# of last free page in segment) +1  */
+#if defined(UVM)
+	int	free_list;		/* which free list they belong on */
+#endif
 	struct	vm_page *pgs;		/* vm_page structures (from start) */
 	struct	vm_page *lastpg;	/* vm_page structure for end */
 	struct	pmap_physseg pmseg;	/* pmap specific (MD) data */