--- Gnu-Mach/vm/vm_page.h	2020/09/02 04:42:54	1.1.1.2
+++ Gnu-Mach/vm/vm_page.h	2020/09/02 04:50:02	1.1.1.5
@@ -34,17 +34,15 @@
 #ifndef	_VM_VM_PAGE_H_
 #define _VM_VM_PAGE_H_
 
-#include <mach_vm_debug.h>
-
 #include <mach/boolean.h>
 #include <mach/vm_prot.h>
 #include <mach/vm_param.h>
 #include <vm/vm_object.h>
+#include <vm/vm_types.h>
 #include <kern/queue.h>
 #include <kern/lock.h>
-#include <kern/zalloc.h>
 
-#include <kern/macro_help.h>
+#include <kern/macros.h>
 #include <kern/sched_prim.h>	/* definitions of wait/wakeup */
 
 #if	MACH_VM_DEBUG
@@ -86,7 +84,7 @@ struct vm_page {
 	vm_object_t	object;		/* which object am I in (O,P) */
 	vm_offset_t	offset;		/* offset into that object (O,P) */
 
-	unsigned int	wire_count:16,	/* how many wired down maps use me?
+	unsigned int	wire_count:15,	/* how many wired down maps use me?
 					   (O&P) */
 	/* boolean_t */	inactive:1,	/* page is in inactive list (P) */
 			active:1,	/* page is in active list (P) */
@@ -94,14 +92,8 @@ struct vm_page {
 			free:1,		/* page is on free list (P) */
 			reference:1,	/* page has been used (P) */
 			external:1,	/* page considered external (P) */
-		        extcounted:1,   /* page counted in ext counts (P) */
-			:0;		/* (force to 'long' boundary) */
-#ifdef	ns32000
-	int		pad;		/* extra space for ns32000 bit ops */
-#endif	/* ns32000 */
-
-	unsigned int
-	/* boolean_t */	busy:1,		/* page is in transit (O) */
+			extcounted:1,   /* page counted in ext counts (P) */
+			busy:1,		/* page is in transit (O) */
 			wanted:1,	/* someone is waiting for page (O) */
 			tabled:1,	/* page is in VP table (O) */
 			fictitious:1,	/* Physical page doesn't exist (O) */
@@ -114,10 +106,9 @@ struct vm_page {
 			dirty:1,	/* Page must be cleaned (O) */
 			precious:1,	/* Page is precious; data must be
 					 *  returned even if clean (O) */
-			overwriting:1,	/* Request to unlock has been made
+			overwriting:1;	/* Request to unlock has been made
 					 * without having data. (O)
 					 * [See vm_object_overwrite] */
-			:0;
 
 	vm_offset_t	phys_addr;	/* Physical address of page, passed
 					 *  to pmap_enter (read-only) */
@@ -125,10 +116,6 @@ struct vm_page {
 	vm_prot_t	unlock_request;	/* Outstanding unlock request (O) */
 };
 
-typedef struct vm_page	*vm_page_t;
-
-#define VM_PAGE_NULL		((vm_page_t) 0)
-
 /*
  *	For debugging, this macro can be defined to perform
  *	some useful check on a page structure.
@@ -162,11 +149,6 @@ extern
 queue_head_t	vm_page_queue_inactive;	/* inactive memory queue */
 
 extern
-vm_offset_t	first_phys_addr;	/* physical address for first_page */
-extern
-vm_offset_t	last_phys_addr;		/* physical address for last_page */
-
-extern
 int	vm_page_free_count;	/* How many pages are free? */
 extern
 int	vm_page_fictitious_count;/* How many fictitious pages are free? */
@@ -253,8 +235,6 @@ extern void		vm_page_copy(vm_page_t src_
 extern void		vm_page_wire(vm_page_t);
 extern void		vm_page_unwire(vm_page_t);
 
-extern void		vm_set_page_size(void);
-
 #if	MACH_VM_DEBUG
 extern unsigned int	vm_page_info(
 	hash_info_bucket_t	*info,