diff options
| -rw-r--r-- | sys/vm/vm_glue.c | 6 | ||||
| -rw-r--r-- | sys/vm/vm_map.h | 24 | ||||
| -rw-r--r-- | sys/vm/vm_object.h | 5 | ||||
| -rw-r--r-- | sys/vm/vm_page.h | 12 |
4 files changed, 4 insertions, 43 deletions
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index eb45d61..5221e18 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -59,7 +59,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_glue.c,v 1.84 1999/02/19 14:25:36 luoqi Exp $ + * $Id: vm_glue.c,v 1.85 1999/04/06 03:11:34 peter Exp $ */ #include "opt_rlimit.h" @@ -112,10 +112,6 @@ SYSINIT(scheduler, SI_SUB_RUN_SCHEDULER, SI_ORDER_FIRST, scheduler, NULL) static void swapout __P((struct proc *)); -extern char kstack[]; - -/* vm_map_t upages_map; */ - int kernacc(addr, len, rw) caddr_t addr; diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index cb9bb12..5342fe7 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_map.h,v 1.40 1999/05/16 05:07:33 alc Exp $ + * $Id: vm_map.h,v 1.41 1999/05/17 00:53:55 alc Exp $ */ /* @@ -76,7 +76,6 @@ * * vm_map_t the high-level address map data structure. * vm_map_entry_t an entry in an address map. - * vm_map_version_t a timestamp of a map, for use with vm_map_lookup */ /* @@ -162,24 +161,6 @@ struct vmspace { caddr_t vm_minsaddr; /* user VA at max stack growth */ }; - -#if 0 -/* - * Map versions are used to validate a previous lookup attempt. - * - * Since lookup operations may involve both a main map and - * a sharing map, it is necessary to have a timestamp from each. - * [If the main map timestamp has changed, the share_map and - * associated timestamp are no longer valid; the map version - * does not include a reference for the embedded share_map.] - */ -typedef struct { - int main_timestamp; - int share_timestamp; -} vm_map_version_t; - -#endif - /* * Macros: vm_map_lock, etc. * Function: @@ -322,9 +303,6 @@ vmspace_resident_count(struct vmspace *vmspace) #define VM_FAULT_DIRTY 8 /* Dirty the page */ #ifdef KERNEL -extern vm_offset_t kentry_data; -extern vm_size_t kentry_data_size; - boolean_t vm_map_check_protection __P((vm_map_t, vm_offset_t, vm_offset_t, vm_prot_t)); int vm_map_copy __P((vm_map_t, vm_map_t, vm_offset_t, vm_size_t, vm_offset_t, boolean_t, boolean_t)); struct pmap; diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index 0a316c8..0fb7c5e 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_object.h,v 1.53 1999/01/21 09:51:21 dillon Exp $ + * $Id: vm_object.h,v 1.54 1999/02/08 19:00:15 dillon Exp $ */ /* @@ -95,9 +95,6 @@ struct vm_object { int ref_count; /* How many refs?? */ int shadow_count; /* how many objects that this is a shadow for */ int pg_color; /* color of first page in obj */ -#if 0 - int id; /* ID for no purpose, other than info */ -#endif int hash_rand; /* vm hash table randomizer */ u_short flags; /* see below */ u_short paging_in_progress; /* Paging (in or out) so don't collapse or destroy */ diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index abff794..39e4524 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_page.h,v 1.59 1999/04/05 19:38:29 julian Exp $ + * $Id: vm_page.h,v 1.60 1999/05/02 23:57:14 alc Exp $ */ /* @@ -279,16 +279,8 @@ extern long first_page; /* first physical page number */ /* ... represented in vm_page_array */ extern long last_page; /* last physical page number */ - /* ... represented in vm_page_array */ - /* [INCLUSIVE] */ -extern vm_offset_t first_phys_addr; /* physical address for first_page */ -extern vm_offset_t last_phys_addr; /* physical address for last_page */ - #define VM_PAGE_TO_PHYS(entry) ((entry)->phys_addr) -#define IS_VM_PHYSADDR(pa) \ - ((pa) >= first_phys_addr && (pa) <= last_phys_addr) - #define PHYS_TO_VM_PAGE(pa) \ (&vm_page_array[atop(pa) - first_page ]) @@ -396,7 +388,6 @@ void vm_page_cache __P((register vm_page_t)); static __inline void vm_page_copy __P((vm_page_t, vm_page_t)); static __inline void vm_page_free __P((vm_page_t)); static __inline void vm_page_free_zero __P((vm_page_t)); -void vm_page_destroy __P((vm_page_t)); void vm_page_deactivate __P((vm_page_t)); void vm_page_insert __P((vm_page_t, vm_object_t, vm_pindex_t)); vm_page_t vm_page_lookup __P((vm_object_t, vm_pindex_t)); @@ -416,7 +407,6 @@ int vm_page_is_valid __P((vm_page_t, int, int)); void vm_page_test_dirty __P((vm_page_t)); int vm_page_bits __P((int, int)); vm_page_t _vm_page_list_find __P((int, int)); -int vm_page_queue_index __P((vm_offset_t, int)); #if 0 int vm_page_sleep(vm_page_t m, char *msg, char *busy); int vm_page_asleep(vm_page_t m, char *msg, char *busy); |
