diff options
Diffstat (limited to 'sys/vm')
| -rw-r--r-- | sys/vm/vm.h | 7 | ||||
| -rw-r--r-- | sys/vm/vm_map.h | 6 | ||||
| -rw-r--r-- | sys/vm/vm_page.h | 10 | ||||
| -rw-r--r-- | sys/vm/vm_param.h | 4 |
4 files changed, 14 insertions, 13 deletions
diff --git a/sys/vm/vm.h b/sys/vm/vm.h index 95d04a1d26d..b953a9c26b5 100644 --- a/sys/vm/vm.h +++ b/sys/vm/vm.h @@ -1,5 +1,5 @@ -/* $OpenBSD: vm.h,v 1.14 2001/07/05 07:25:54 art Exp $ */ -/* $NetBSD: vm.h,v 1.13 1994/06/29 06:47:52 cgd Exp $ */ +/* $OpenBSD: vm.h,v 1.15 2001/08/06 14:03:05 art Exp $ */ +/* $NetBSD: vm.h,v 1.22 2000/03/26 20:54:48 kleink Exp $ */ /* * Copyright (c) 1991, 1993 @@ -39,7 +39,8 @@ #ifndef VM_H #define VM_H -typedef int vm_inherit_t; /* XXX: inheritance codes */ +typedef int vm_inherit_t; /* XXX: inheritance codes */ +typedef off_t voff_t; /* XXX: offset within a uvm_object */ union vm_map_object; typedef union vm_map_object vm_map_object_t; diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index 6d88dfdf3cb..5ae119ae900 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -1,5 +1,5 @@ -/* $OpenBSD: vm_map.h,v 1.15 2001/06/27 04:52:39 art Exp $ */ -/* $NetBSD: vm_map.h,v 1.11 1995/03/26 20:39:10 jtc Exp $ */ +/* $OpenBSD: vm_map.h,v 1.16 2001/08/06 14:03:05 art Exp $ */ +/* $NetBSD: vm_map.h,v 1.35 2000/03/26 20:54:48 kleink Exp $ */ /* * Copyright (c) 1991, 1993 @@ -107,7 +107,7 @@ struct vm_map_entry { vaddr_t start; /* start address */ vaddr_t end; /* end address */ union vm_map_object object; /* object I point to */ - vsize_t offset; /* offset into object */ + voff_t offset; /* offset into object */ /* etype is a bitmap that replaces the following 4 items */ int etype; /* entry type */ /* Only in task maps: */ diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index 3b275773afa..3c9665221fd 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -1,5 +1,5 @@ -/* $OpenBSD: vm_page.h,v 1.15 2001/07/25 14:47:58 art Exp $ */ -/* $NetBSD: vm_page.h,v 1.24 1998/02/10 14:09:03 mrg Exp $ */ +/* $OpenBSD: vm_page.h,v 1.16 2001/08/06 14:03:05 art Exp $ */ +/* $NetBSD: vm_page.h,v 1.35 2000/03/26 20:54:48 kleink Exp $ */ /* * Copyright (c) 1991, 1993 @@ -117,10 +117,10 @@ struct vm_page { TAILQ_ENTRY(vm_page) hashq; /* hash table links (O)*/ TAILQ_ENTRY(vm_page) listq; /* pages in same object (O)*/ - vaddr_t offset; /* offset into object (O,P) */ - - struct uvm_object *uobject; /* object (O,P) */ struct vm_anon *uanon; /* anon (O,P) */ + struct uvm_object *uobject; /* object (O,P) */ + voff_t offset; /* offset into object (O,P) */ + u_short flags; /* object flags [O] */ u_short version; /* version count [O] */ u_short wire_count; /* wired down map refs [P] */ diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h index 946b183bc39..8d1293309dd 100644 --- a/sys/vm/vm_param.h +++ b/sys/vm/vm_param.h @@ -1,5 +1,5 @@ -/* $OpenBSD: vm_param.h,v 1.23 2001/08/02 11:06:38 art Exp $ */ -/* $NetBSD: vm_param.h,v 1.12 1995/03/26 20:39:16 jtc Exp $ */ +/* $OpenBSD: vm_param.h,v 1.24 2001/08/06 14:03:05 art Exp $ */ +/* $NetBSD: vm_param.h,v 1.25 2000/03/26 20:42:45 kleink Exp $ */ /* * Copyright (c) 1991, 1993 |