BSD 4_4_Lite2 release

[unix-history] / usr / src / sys / vm / vm.h

diff --git a/usr/src/sys/vm/vm.h b/usr/src/sys/vm/vm.h
index aeb2b36..25a2599 100644 (file)
--- a/usr/src/sys/vm/vm.h
+++ b/usr/src/sys/vm/vm.h
@@ -1,10 +1,36 @@
 /*
 /*

- * Copyright (c) 1991 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1991, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)vm.h        7.4 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)vm.h        8.5 (Berkeley) 5/11/95

  */
 
 #ifndef VM_H
  */
 
 #ifndef VM_H


@@ -30,32 +56,18 @@ typedef struct vm_page  *vm_page_t;
 struct pager_struct;
 typedef struct pager_struct *vm_pager_t;
 
 struct pager_struct;
 typedef struct pager_struct *vm_pager_t;
 

-#include <sys/vmmeter.h>
-#include <sys/queue.h>
-

 /*
 /*

- * Compatibility with old MACH queue.h
+ *     MACH VM locking type mappings to kernel types

  */
  */

-typedef struct queue_entry     *queue_t;
-typedef        struct queue_entry      queue_head_t;
-typedef        struct queue_entry      queue_chain_t;
-typedef        struct queue_entry      *queue_entry_t;
-
-#define        queue_first(head)       ((head)->next)
-#define        queue_next(elm)         ((elm)->next)
-#define        queue_empty(head)       ((head)->next == 0)
-#define        queue_end(elm, head)    ((elm) == 0)
-
-#define queue_enter(head, elt, type, field) \
-       queue_enter_tail(head, elt, type, field)
-
-#define queue_remove_first(head, elt, type, field) { \
-       elt = queue_first(head); \
-       queue_remove(head, elt, type, field) \
-}
+typedef struct simplelock      simple_lock_data_t;
+typedef struct simplelock      *simple_lock_t;
+typedef struct lock            lock_data_t;
+typedef struct lock            *lock_t;

 
 

+#include <sys/vmmeter.h>
+#include <sys/queue.h>

 #include <vm/vm_param.h>
 #include <vm/vm_param.h>

-#include <vm/lock.h>
+#include <sys/lock.h>

 #include <vm/vm_prot.h>
 #include <vm/vm_inherit.h>
 #include <vm/vm_map.h>
 #include <vm/vm_prot.h>
 #include <vm/vm_inherit.h>
 #include <vm/vm_map.h>