Commit a whole cluster of last minute critical (and one cosmetic) fixes

[unix-history] / sys / vm / vm_param.h

diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h
index db2f082..4383984 100644 (file)
--- a/sys/vm/vm_param.h
+++ b/sys/vm/vm_param.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *     from: @(#)vm_param.h    7.2 (Berkeley) 4/21/91
  * SUCH DAMAGE.
  *
  *     from: @(#)vm_param.h    7.2 (Berkeley) 4/21/91

- *     $Id$
+ *     $Id: vm_param.h,v 1.5 1994/01/31 04:21:55 davidg Exp $

  */
 
 /*
  */
 
 /*


@@ -84,20 +84,6 @@ typedef int  boolean_t;
 #define        TRUE    1
 #define        FALSE   0
 
 #define        TRUE    1
 #define        FALSE   0
 

-/*
- *     The machine independent pages are refered to as PAGES.  A page
- *     is some number of hardware pages, depending on the target machine.
- */
-
-/*
- *     All references to the size of a page should be done with PAGE_SIZE
- *     or PAGE_SHIFT.  The fact they are variables is hidden here so that
- *     we can easily make them constant if we so desire.
- */
-
-#define        PAGE_SIZE       page_size       /* size of page in addressible units */
-#define PAGE_SHIFT     page_shift      /* number of bits to shift for pages */
-

 /* 
  *     Return values from the VM routines.
  */
 /* 
  *     Return values from the VM routines.
  */


@@ -112,17 +98,12 @@ typedef int        boolean_t;
 #define        KERN_NO_ACCESS          8
 
 #ifdef ASSEMBLER
 #define        KERN_NO_ACCESS          8
 
 #ifdef ASSEMBLER

-#else  ASSEMBLER
+#else /* ASSEMBLER */

 /*
  *     Convert addresses to pages and vice versa.
  *     No rounding is used.
  */
 
 /*
  *     Convert addresses to pages and vice versa.
  *     No rounding is used.
  */
 

-#ifdef KERNEL
-#define        atop(x)         (((unsigned)(x)) >> page_shift)
-#define        ptoa(x)         ((vm_offset_t)((x) << page_shift))
-#endif KERNEL
-

 /*
  *     Round off or truncate to the nearest page.  These will work
  *     for either addresses or counts.  (i.e. 1 byte rounds to 1 page
 /*
  *     Round off or truncate to the nearest page.  These will work
  *     for either addresses or counts.  (i.e. 1 byte rounds to 1 page


@@ -130,24 +111,10 @@ typedef int       boolean_t;
  */
 
 #ifdef KERNEL
  */
 
 #ifdef KERNEL

-#define round_page(x)  ((vm_offset_t)((((vm_offset_t)(x)) + page_mask) & ~page_mask))
-#define trunc_page(x)  ((vm_offset_t)(((vm_offset_t)(x)) & ~page_mask))
-#else  KERNEL
-#define        round_page(x)   ((((vm_offset_t)(x) + (vm_page_size - 1)) / vm_page_size) * vm_page_size)
-#define        trunc_page(x)   ((((vm_offset_t)(x)) / vm_page_size) * vm_page_size)
-#endif KERNEL
-
-#ifdef KERNEL
-extern vm_size_t       page_size;      /* machine independent page size */
-extern vm_size_t       page_mask;      /* page_size - 1; mask for
-                                                  offset within page */
-extern int             page_shift;     /* shift to use for page size */
-
-extern vm_size_t       mem_size;       /* size of physical memory (bytes) */

 extern vm_offset_t     first_addr;     /* first physical page */
 extern vm_offset_t     last_addr;      /* last physical page */
 extern vm_offset_t     first_addr;     /* first physical page */
 extern vm_offset_t     last_addr;      /* last physical page */

-#endif KERNEL
+#endif /* KERNEL */

 
 

-#endif ASSEMBLER
+#endif /* ASSEMBLER */

 
 

-#endif _VM_PARAM_
+#endif /* _VM_PARAM_ */