diff options
| author | alc <alc@FreeBSD.org> | 1999-03-02 05:43:18 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 1999-03-02 05:43:18 +0000 |
| commit | 5149bf66662d331a001b00be7eda524726a4d8c4 (patch) | |
| tree | 0fe83d0be0165208214578cff25ba612712f8828 /sys/vm | |
| parent | f86ebee5a71b73933ccd7a7f52876d3e5b25278f (diff) | |
| download | FreeBSD-src-5149bf66662d331a001b00be7eda524726a4d8c4.zip FreeBSD-src-5149bf66662d331a001b00be7eda524726a4d8c4.tar.gz | |
Remove the last of the share map code: struct vm_map::is_main_map.
Reviewed by: Matthew Dillon <dillon@apollo.backplane.com>
Diffstat (limited to 'sys/vm')
| -rw-r--r-- | sys/vm/vm_map.c | 22 | ||||
| -rw-r--r-- | sys/vm/vm_map.h | 3 |
2 files changed, 10 insertions, 15 deletions
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 05c8c5c..4f6a359 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_map.c,v 1.151 1999/02/19 14:25:36 luoqi Exp $ + * $Id: vm_map.c,v 1.152 1999/02/24 21:26:25 dillon Exp $ */ /* @@ -278,7 +278,6 @@ vm_map_init(map, min, max) map->header.next = map->header.prev = &map->header; map->nentries = 0; map->size = 0; - map->is_main_map = TRUE; map->system_map = 0; map->min_offset = min; map->max_offset = max; @@ -556,12 +555,11 @@ vm_map_insert(vm_map_t map, vm_object_t object, vm_ooffset_t offset, new_entry->offset = offset; new_entry->avail_ssize = 0; - if (map->is_main_map) { - new_entry->inheritance = VM_INHERIT_DEFAULT; - new_entry->protection = prot; - new_entry->max_protection = max; - new_entry->wired_count = 0; - } + new_entry->inheritance = VM_INHERIT_DEFAULT; + new_entry->protection = prot; + new_entry->max_protection = max; + new_entry->wired_count = 0; + /* * Insert the new entry into the list */ @@ -1998,8 +1996,6 @@ vm_map_delete(map, start, end) if ((object == kernel_object) || (object == kmem_object)) { vm_object_page_remove(object, offidxstart, offidxend, FALSE); - } else if (!map->is_main_map) { - vm_object_pmap_remove(object, offidxstart, offidxend); } else { pmap_remove(map->pmap, s, e); if (object && @@ -2960,8 +2956,8 @@ DB_SHOW_COMMAND(map, vm_map_print) vm_map_entry_t entry; - db_iprintf("%s map %p: pmap=%p, nentries=%d, version=%u\n", - (map->is_main_map ? "Task" : "Share"), (void *)map, + db_iprintf("Task map %p: pmap=%p, nentries=%d, version=%u\n", + (void *)map, (void *)map->pmap, map->nentries, map->timestamp); nlines++; @@ -2974,7 +2970,7 @@ DB_SHOW_COMMAND(map, vm_map_print) db_iprintf("map entry %p: start=%p, end=%p\n", (void *)entry, (void *)entry->start, (void *)entry->end); nlines++; - if (map->is_main_map) { + { static char *inheritance_name[4] = {"share", "copy", "none", "donate_copy"}; diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index aac6641..1be6f4e 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.35 1999/02/07 21:48:22 dillon Exp $ + * $Id: vm_map.h,v 1.36 1999/02/19 14:25:36 luoqi Exp $ */ /* @@ -130,7 +130,6 @@ struct vm_map { struct vm_map_entry header; /* List of entries */ int nentries; /* Number of entries */ vm_size_t size; /* virtual size */ - unsigned char is_main_map; /* Am I a main map? */ unsigned char system_map; /* Am I a system map? */ vm_map_entry_t hint; /* hint for quick lookups */ unsigned int timestamp; /* Version number */ |
