cleanup function prototypes

SCCS-vsn: sys/vm/vm_object.h 7.7
SCCS-vsn: sys/vm/vm_page.h 7.7

diff --git a/usr/src/sys/vm/vm_object.h b/usr/src/sys/vm/vm_object.h
index bf002ef..5872c51 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.6 (Berkeley) %G%
+ *     @(#)vm_object.h 7.7 (Berkeley) %G%

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


@@ -78,8 +78,6 @@ struct vm_object {
 #define OBJ_INTERNAL   0x0002  /* internally created object */
 #define OBJ_ACTIVE     0x0004  /* used to mark active objects */
 
 #define OBJ_INTERNAL   0x0002  /* internally created object */
 #define OBJ_ACTIVE     0x0004  /* used to mark active objects */
 

-typedef struct vm_object       *vm_object_t;
-

 struct vm_object_hash_entry {
        queue_chain_t           hash_links;     /* hash chain links */
        vm_object_t             object;         /* object we represent */
 struct vm_object_hash_entry {
        queue_chain_t           hash_links;     /* hash chain links */
        vm_object_t             object;         /* object we represent */


@@ -104,35 +102,6 @@ vm_object_t        kmem_object;
 #define        vm_object_cache_unlock()        simple_unlock(&vm_cache_lock)
 #endif KERNEL
 
 #define        vm_object_cache_unlock()        simple_unlock(&vm_cache_lock)
 #endif KERNEL
 

-/*
- *     Declare procedures that operate on VM objects.
- */
-
-void   vm_object_init __P((vm_size_t));
-void   vm_object_terminate __P((vm_object_t));
-vm_object_t    vm_object_allocate __P((vm_size_t));
-void   vm_object_reference __P((vm_object_t));
-void   vm_object_deallocate __P((vm_object_t));
-void   vm_object_pmap_copy __P((vm_object_t, vm_offset_t, vm_offset_t));
-void   vm_object_pmap_remove __P((vm_object_t, vm_offset_t, vm_offset_t));
-void   vm_object_page_remove __P((vm_object_t, vm_offset_t, vm_offset_t));
-void   vm_object_shadow __P((vm_object_t *, vm_offset_t *, vm_size_t));
-void   vm_object_copy __P((vm_object_t, vm_offset_t, vm_size_t,
-                           vm_object_t *, vm_offset_t *, boolean_t *));
-void   vm_object_collapse __P((vm_object_t));
-vm_object_t    vm_object_lookup __P((vm_pager_t));
-void   vm_object_enter __P((vm_object_t, vm_pager_t));
-void   vm_object_setpager __P((vm_object_t, vm_pager_t,
-                               vm_offset_t, boolean_t));
-#define        vm_object_cache(pager)   pager_cache(vm_object_lookup(pager),TRUE)
-#define        vm_object_uncache(pager) pager_cache(vm_object_lookup(pager),FALSE)
-
-void   vm_object_cache_clear __P((void));
-void   vm_object_print __P((vm_object_t, boolean_t));
-
-void   thread_sleep __P((int, simple_lock_t, boolean_t));
-void   thread_wakeup __P((int));
-

 #if    VM_OBJECT_DEBUG
 #define        vm_object_lock_init(object)     { simple_lock_init(&(object)->Lock); (object)->LockHolder = 0; }
 #define        vm_object_lock(object)          { simple_lock(&(object)->Lock); (object)->LockHolder = (int) current_thread(); }
 #if    VM_OBJECT_DEBUG
 #define        vm_object_lock_init(object)     { simple_lock_init(&(object)->Lock); (object)->LockHolder = 0; }
 #define        vm_object_lock(object)          { simple_lock(&(object)->Lock); (object)->LockHolder = (int) current_thread(); }


@@ -149,4 +118,36 @@ void       thread_wakeup __P((int));
                                        thread_sleep((event), &(object)->Lock, (interruptible))
 #endif VM_OBJECT_DEBUG
 
                                        thread_sleep((event), &(object)->Lock, (interruptible))
 #endif VM_OBJECT_DEBUG
 

+#ifdef KERNEL
+vm_object_t     vm_object_allocate __P((vm_size_t));
+void            vm_object_cache_clear __P((void));
+void            vm_object_cache_trim __P((void));
+boolean_t       vm_object_coalesce __P((vm_object_t, vm_object_t,
+                   vm_offset_t, vm_offset_t, vm_offset_t, vm_size_t));
+void            vm_object_collapse __P((vm_object_t));
+void            vm_object_copy __P((vm_object_t, vm_offset_t, vm_size_t,
+                   vm_object_t *, vm_offset_t *, boolean_t *));
+void            vm_object_deactivate_pages __P((vm_object_t));
+void            vm_object_deallocate __P((vm_object_t));
+void            vm_object_enter __P((vm_object_t, vm_pager_t));
+void            vm_object_init __P((vm_size_t));
+vm_object_t     vm_object_lookup __P((vm_pager_t));
+void            vm_object_page_clean __P((vm_object_t,
+                   vm_offset_t, vm_offset_t, boolean_t));
+void            vm_object_page_remove __P((vm_object_t,
+                   vm_offset_t, vm_offset_t));
+void            vm_object_pmap_copy __P((vm_object_t,
+                   vm_offset_t, vm_offset_t));
+void            vm_object_pmap_remove __P((vm_object_t,
+                   vm_offset_t, vm_offset_t));
+void            vm_object_print __P((vm_object_t, boolean_t));
+void            vm_object_reference __P((vm_object_t));
+void            vm_object_remove __P((vm_pager_t));
+void            vm_object_setpager __P((vm_object_t,
+                   vm_pager_t, vm_offset_t, boolean_t));
+void            vm_object_shadow __P((vm_object_t *,
+                   vm_offset_t *, vm_size_t));
+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_page.h b/usr/src/sys/vm/vm_page.h
index a1aaadc..f3a5ebb 100644 (file)
--- a/usr/src/sys/vm/vm_page.h
+++ b/usr/src/sys/vm/vm_page.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vm_page.h   7.6 (Berkeley) %G%
+ *     @(#)vm_page.h   7.7 (Berkeley) %G%

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


@@ -108,8 +108,6 @@ struct vm_page {
        vm_prot_t       unlock_request; /* Outstanding unlock request */
 };
 
        vm_prot_t       unlock_request; /* Outstanding unlock request */
 };
 

-typedef struct vm_page *vm_page_t;
-

 #if    VM_PAGE_DEBUG
 #define        VM_PAGE_CHECK(mem) { \
                if ( (((unsigned int) mem) < ((unsigned int) &vm_page_array[0])) || \
 #if    VM_PAGE_DEBUG
 #define        VM_PAGE_CHECK(mem) { \
                if ( (((unsigned int) mem) < ((unsigned int) &vm_page_array[0])) || \


@@ -121,7 +119,7 @@ typedef struct vm_page      *vm_page_t;
 #define        VM_PAGE_CHECK(mem)
 #endif VM_PAGE_DEBUG
 
 #define        VM_PAGE_CHECK(mem)
 #endif VM_PAGE_DEBUG
 

-#ifdef KERNEL
+#ifdef KERNEL

 /*
  *     Each pageable resident page falls into one of three lists:
  *
 /*
  *     Each pageable resident page falls into one of three lists:
  *


@@ -170,25 +168,8 @@ vm_offset_t        last_phys_addr;         /* physical address for last_page */
 extern
 simple_lock_data_t     vm_page_queue_lock;     /* lock on active and inactive
                                                   page queues */
 extern
 simple_lock_data_t     vm_page_queue_lock;     /* lock on active and inactive
                                                   page queues */

-extern
+extern                                         /* lock on free page queue */

 simple_lock_data_t     vm_page_queue_free_lock;
 simple_lock_data_t     vm_page_queue_free_lock;

-                                               /* lock on free page queue */
-void           vm_page_startup __P((vm_offset_t *start, vm_offset_t *end));
-vm_page_t      vm_page_lookup __P((vm_object_t object, vm_offset_t offset));
-vm_page_t      vm_page_alloc __P((vm_object_t object, vm_offset_t offset));
-void           vm_page_free __P((vm_page_t mem));
-void           vm_page_activate __P((vm_page_t mem));
-void           vm_page_deactivate __P((vm_page_t mem));
-void           vm_page_rename __P((vm_page_t mem, vm_object_t new_object,
-                       vm_offset_t new_offset));
-
-boolean_t      vm_page_zero_fill __P((vm_page_t mem));
-void           vm_page_copy __P((vm_page_t src_mem, vm_page_t dst_mem));
-
-void           vm_page_wire __P((vm_page_t mem));
-void           vm_page_unwire __P((vm_page_t mem));
-
-void           vm_set_page_size __P((void));

 
 /*
  *     Functions implemented as macros
 
 /*
  *     Functions implemented as macros


@@ -236,5 +217,19 @@ void               vm_set_page_size __P((void));
        VM_PAGE_DEBUG_INIT(mem); \
 }
 
        VM_PAGE_DEBUG_INIT(mem); \
 }
 

-#endif KERNEL
-#endif _VM_PAGE_
+void            vm_page_activate __P((vm_page_t));
+vm_page_t       vm_page_alloc __P((vm_object_t, vm_offset_t));
+void            vm_page_copy __P((vm_page_t, vm_page_t));
+void            vm_page_deactivate __P((vm_page_t));
+void            vm_page_free __P((vm_page_t));
+void            vm_page_insert __P((vm_page_t, vm_object_t, vm_offset_t));
+vm_page_t       vm_page_lookup __P((vm_object_t, vm_offset_t));
+void            vm_page_remove __P((vm_page_t));
+void            vm_page_rename __P((vm_page_t, vm_object_t, vm_offset_t));
+void            vm_page_startup __P((vm_offset_t *, vm_offset_t *));
+void            vm_page_unwire __P((vm_page_t));
+void            vm_page_wire __P((vm_page_t));
+boolean_t       vm_page_zero_fill __P((vm_page_t));
+
+#endif /* KERNEL */
+#endif /* !_VM_PAGE_ */