[src/trunk]: src/sys move the contents of <vm/vm.h> into <uvm/uvm_extern.h>. ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6bc965581e78
branches:  trunk
changeset: 493933:6bc965581e78
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Jun 27 16:16:43 2000 +0000

description:
move the contents of <vm/vm.h> into <uvm/uvm_extern.h>.  <vm/vm.h> is simply
an include of <uvm/uvm_extern.h> now.

diffstat:

 sys/uvm/uvm_extern.h |  77 +++++++++++++++++++++++++++++++++++++----
 sys/vm/vm.h          |  95 +---------------------------------------------------
 2 files changed, 69 insertions(+), 103 deletions(-)

diffs (214 lines):

diff -r 7421cf0e6eaf -r 6bc965581e78 sys/uvm/uvm_extern.h
--- a/sys/uvm/uvm_extern.h      Tue Jun 27 09:10:24 2000 +0000
+++ b/sys/uvm/uvm_extern.h      Tue Jun 27 16:16:43 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_extern.h,v 1.44 2000/06/27 09:00:14 mrg Exp $      */
+/*     $NetBSD: uvm_extern.h,v 1.45 2000/06/27 16:16:43 mrg Exp $      */
 
 /*
  *
@@ -35,7 +35,7 @@
  */
 
 /*-
- * Copyright (c) 1992, 1993
+ * Copyright (c) 1991, 1992, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -84,6 +84,28 @@
  */
 
 /*
+ * typedefs, necessary for standard UVM headers.
+ */
+
+typedef unsigned int  uvm_flag_t;
+typedef int vm_fault_t;
+
+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;
+
+struct vm_map_entry;
+typedef struct vm_map_entry *vm_map_entry_t;
+
+struct vm_map;
+typedef struct vm_map *vm_map_t;
+
+struct vm_page;
+typedef struct vm_page  *vm_page_t;
+
+/*
  * defines
  */
 
@@ -293,8 +315,46 @@
 };
 
 #ifdef _KERNEL
+extern struct uvmexp uvmexp;
+#endif
 
-extern struct uvmexp uvmexp;
+/*
+ * Finally, bring in standard UVM headers.
+ */
+#include <sys/vmmeter.h>
+#include <sys/queue.h>
+#include <uvm/uvm_param.h>
+#include <sys/lock.h>
+#include <uvm/uvm_prot.h>
+#include <uvm/uvm_inherit.h>
+#include <uvm/uvm_page.h>
+#include <uvm/uvm_pmap.h>
+#include <uvm/uvm_map.h>
+#include <uvm/uvm_fault.h>
+#include <uvm/uvm_pager.h>
+
+/*
+ * Shareable process virtual address space.
+ * May eventually be merged with vm_map.
+ * Several fields are temporary (text, data stuff).
+ */
+struct vmspace {
+       struct  vm_map vm_map;  /* VM address map */
+       int     vm_refcnt;      /* number of references */
+       caddr_t vm_shm;         /* SYS5 shared memory private data XXX */
+/* we copy from vm_startcopy to the end of the structure on fork */
+#define vm_startcopy vm_rssize
+       segsz_t vm_rssize;      /* current resident set size in pages */
+       segsz_t vm_swrss;       /* resident set size before last swap */
+       segsz_t vm_tsize;       /* text size (pages) XXX */
+       segsz_t vm_dsize;       /* data size (pages) XXX */
+       segsz_t vm_ssize;       /* stack size (pages) */
+       caddr_t vm_taddr;       /* user virtual address of text XXX */
+       caddr_t vm_daddr;       /* user virtual address of data XXX */
+       caddr_t vm_maxsaddr;    /* user VA at max stack growth */
+};
+
+#ifdef _KERNEL
 
 /*
  * the various kernel maps, owned by MD code
@@ -315,12 +375,11 @@
 
 #endif /* _KERNEL */
 
-/*
- * typedefs 
- */
-
-typedef unsigned int  uvm_flag_t;
-typedef int vm_fault_t;
+#ifdef pmap_resident_count
+#define vm_resident_count(vm) (pmap_resident_count((vm)->vm_map.pmap))
+#else
+#define vm_resident_count(vm) ((vm)->vm_rssize)
+#endif
 
 /* XXX clean up later */
 struct buf;
diff -r 7421cf0e6eaf -r 6bc965581e78 sys/vm/vm.h
--- a/sys/vm/vm.h       Tue Jun 27 09:10:24 2000 +0000
+++ b/sys/vm/vm.h       Tue Jun 27 16:16:43 2000 +0000
@@ -1,96 +1,3 @@
-/*     $NetBSD: vm.h,v 1.28 2000/06/27 09:00:15 mrg Exp $      */
-
-/*
- * Copyright (c) 1991, 1993
- *     The Regents of the University of California.  All rights reserved.
- *
- * 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.
- *
- * 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
-#define VM_H
-
-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;
+/*     $NetBSD: vm.h,v 1.29 2000/06/27 16:16:45 mrg Exp $      */
 
-struct vm_map_entry;
-typedef struct vm_map_entry *vm_map_entry_t;
-
-struct vm_map;
-typedef struct vm_map *vm_map_t;
-
-struct vm_page;
-typedef struct vm_page  *vm_page_t;
-
-#include <sys/vmmeter.h>
-#include <sys/queue.h>
-#include <uvm/uvm_param.h>
-#include <sys/lock.h>
-#include <uvm/uvm_prot.h>
-#include <uvm/uvm_inherit.h>
-#include <uvm/uvm_page.h>
-#include <uvm/uvm_pmap.h>
-#include <uvm/uvm_map.h>
-#include <uvm/uvm_fault.h>
-#include <uvm/uvm_pager.h>
 #include <uvm/uvm_extern.h>
-
-/*
- * Shareable process virtual address space.
- * May eventually be merged with vm_map.
- * Several fields are temporary (text, data stuff).
- */
-struct vmspace {
-       struct  vm_map vm_map;  /* VM address map */
-       int     vm_refcnt;      /* number of references */
-       caddr_t vm_shm;         /* SYS5 shared memory private data XXX */
-/* we copy from vm_startcopy to the end of the structure on fork */
-#define vm_startcopy vm_rssize
-       segsz_t vm_rssize;      /* current resident set size in pages */
-       segsz_t vm_swrss;       /* resident set size before last swap */
-       segsz_t vm_tsize;       /* text size (pages) XXX */
-       segsz_t vm_dsize;       /* data size (pages) XXX */
-       segsz_t vm_ssize;       /* stack size (pages) */
-       caddr_t vm_taddr;       /* user virtual address of text XXX */
-       caddr_t vm_daddr;       /* user virtual address of data XXX */
-       caddr_t vm_maxsaddr;    /* user VA at max stack growth */
-};
-
-#ifdef pmap_resident_count
-#define vm_resident_count(vm) (pmap_resident_count((vm)->vm_map.pmap))
-#else
-#define vm_resident_count(vm) ((vm)->vm_rssize)
-#endif
-
-#endif /* VM_H */