pedantically ANSI, i.e., nothing after #else/#endif

SCCS-vsn: sys/vm/vm_map.h 7.6
SCCS-vsn: sys/vm/vm_object.h 7.9
SCCS-vsn: sys/vm/vm_inherit.h 7.4
SCCS-vsn: sys/vm/vm_prot.h 7.3
SCCS-vsn: sys/vm/vm_param.h 7.9

diff --git a/usr/src/sys/vm/vm_inherit.h b/usr/src/sys/vm/vm_inherit.h
index 719b4f4..59c4d90 100644 (file)
--- a/usr/src/sys/vm/vm_inherit.h
+++ b/usr/src/sys/vm/vm_inherit.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vm_inherit.h        7.3 (Berkeley) %G%
+ *     @(#)vm_inherit.h        7.4 (Berkeley) %G%

  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.


@@ -54,4 +54,4 @@
 
 #define VM_INHERIT_DEFAULT     VM_INHERIT_COPY
 
 
 #define VM_INHERIT_DEFAULT     VM_INHERIT_COPY
 

-#endif _VM_INHERIT_
+#endif /* _VM_INHERIT_ */

diff --git a/usr/src/sys/vm/vm_map.h b/usr/src/sys/vm/vm_map.h
index b59d1fd..3b0f9a5 100644 (file)
--- a/usr/src/sys/vm/vm_map.h
+++ b/usr/src/sys/vm/vm_map.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vm_map.h    7.5 (Berkeley) %G%
+ *     @(#)vm_map.h    7.6 (Berkeley) %G%

  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.


@@ -199,4 +199,4 @@ void                 vm_map_startup __P((void));
 int             vm_map_submap __P((vm_map_t,
                    vm_offset_t, vm_offset_t, vm_map_t));
 #endif
 int             vm_map_submap __P((vm_map_t,
                    vm_offset_t, vm_offset_t, vm_map_t));
 #endif

-#endif _VM_MAP_
+#endif /* _VM_MAP_ */

diff --git a/usr/src/sys/vm/vm_object.h b/usr/src/sys/vm/vm_object.h
index b69ee9d..4edeb91 100644 (file)
--- a/usr/src/sys/vm/vm_object.h
+++ b/usr/src/sys/vm/vm_object.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vm_object.h 7.8 (Berkeley) %G%
+ *     @(#)vm_object.h 7.9 (Berkeley) %G%

  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.


@@ -99,7 +99,7 @@ vm_object_t   kmem_object;
 
 #define        vm_object_cache_lock()          simple_lock(&vm_cache_lock)
 #define        vm_object_cache_unlock()        simple_unlock(&vm_cache_lock)
 
 #define        vm_object_cache_lock()          simple_lock(&vm_cache_lock)
 #define        vm_object_cache_unlock()        simple_unlock(&vm_cache_lock)

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

 
 #define        vm_object_lock_init(object)     simple_lock_init(&(object)->Lock)
 #define        vm_object_lock(object)          simple_lock(&(object)->Lock)
 
 #define        vm_object_lock_init(object)     simple_lock_init(&(object)->Lock)
 #define        vm_object_lock(object)          simple_lock(&(object)->Lock)


@@ -140,4 +140,4 @@ void                 vm_object_shadow __P((vm_object_t *,
 void            vm_object_shutdown __P((void));
 void            vm_object_terminate __P((vm_object_t));
 #endif
 void            vm_object_shutdown __P((void));
 void            vm_object_terminate __P((vm_object_t));
 #endif

-#endif _VM_OBJECT_
+#endif /* _VM_OBJECT_ */

diff --git a/usr/src/sys/vm/vm_param.h b/usr/src/sys/vm/vm_param.h
index 42419c1..6911363 100644 (file)
--- a/usr/src/sys/vm/vm_param.h
+++ b/usr/src/sys/vm/vm_param.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vm_param.h  7.8 (Berkeley) %G%
+ *     @(#)vm_param.h  7.9 (Berkeley) %G%

  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.


@@ -97,44 +97,37 @@ extern int          page_shift;
 #define        KERN_NOT_RECEIVER       7
 #define        KERN_NO_ACCESS          8
 
 #define        KERN_NOT_RECEIVER       7
 #define        KERN_NO_ACCESS          8
 

-#ifdef ASSEMBLER
-#else  ASSEMBLER
+#ifndef 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
+#ifdef KERNEL

 #define        atop(x)         (((unsigned)(x)) >> PAGE_SHIFT)
 #define        ptoa(x)         ((vm_offset_t)((x) << PAGE_SHIFT))
 #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
- *     bytes.
+ * Round off or truncate to the nearest page.  These will work
+ * for either addresses or counts (i.e., 1 byte rounds to 1 page).

  */
  */

-
-#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))
 #define num_pages(x) \
        ((vm_offset_t)((((vm_offset_t)(x)) + PAGE_MASK) >> PAGE_SHIFT))
 #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))
 #define num_pages(x) \
        ((vm_offset_t)((((vm_offset_t)(x)) + PAGE_MASK) >> PAGE_SHIFT))

-#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       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_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 */

-#endif KERNEL

 
 

-#endif ASSEMBLER
+#else
+/* out-of-kernel versions of round_page and trunc_page */
+#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 _VM_PARAM_
+#endif /* KERNEL */
+#endif /* ASSEMBLER */
+#endif /* _VM_PARAM_ */

diff --git a/usr/src/sys/vm/vm_prot.h b/usr/src/sys/vm/vm_prot.h
index acb6e39..0414a32 100644 (file)
--- a/usr/src/sys/vm/vm_prot.h
+++ b/usr/src/sys/vm/vm_prot.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vm_prot.h   7.2 (Berkeley) %G%
+ *     @(#)vm_prot.h   7.3 (Berkeley) %G%

  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.
  *
  *
  * Copyright (c) 1987, 1990 Carnegie-Mellon University.


@@ -73,4 +73,4 @@ typedef int           vm_prot_t;
 
 #define VM_PROT_ALL    (VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE)
 
 
 #define VM_PROT_ALL    (VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE)
 

-#endif _VM_PROT_
+#endif /* _VM_PROT_ */