From 20a6e5473bc1124164342b73c85d850b31ccf85d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 15 May 2005 15:06:57 +0000 Subject: [PATCH] Renamed RESERVED_REGION_ID to RESERVED_AREA_ID. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12674 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/vm_priv.h | 4 +++- src/system/kernel/vm/vm.c | 22 +++++++++++----------- src/system/kernel/vm/vm_daemons.c | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/headers/private/kernel/vm_priv.h b/headers/private/kernel/vm_priv.h index 73f166f41d..843d422281 100644 --- a/headers/private/kernel/vm_priv.h +++ b/headers/private/kernel/vm_priv.h @@ -29,7 +29,9 @@ #define WRITE_COUNT 1024 #define READ_COUNT 1 -#define RESERVED_REGION_ID -1 +// reserved area definitions +#define RESERVED_AREA_ID -1 +#define RESERVED_AVOID_BASE 0x01 // page attributes (in addition to B_READ_AREA etc.) #define PAGE_MODIFIED 0x1000 diff --git a/src/system/kernel/vm/vm.c b/src/system/kernel/vm/vm.c index 339a725e7b..7f803f339a 100644 --- a/src/system/kernel/vm/vm.c +++ b/src/system/kernel/vm/vm.c @@ -124,7 +124,7 @@ _vm_create_reserved_region_struct(vm_virtual_map *map) return NULL; memset(reserved, 0, sizeof(vm_area)); - reserved->id = RESERVED_REGION_ID; + reserved->id = RESERVED_AREA_ID; // this marks it as reserved space reserved->map = map; @@ -187,7 +187,7 @@ find_reserved_area(vm_virtual_map *map, addr_t start, addr_t size, vm_area *area while (next) { if (next->base <= start && next->base + next->size >= start + size) { // this area covers the requested range - if (next->id != RESERVED_REGION_ID) { + if (next->id != RESERVED_AREA_ID) { // but it's not reserved space, it's a real area return B_BAD_VALUE; } @@ -590,7 +590,7 @@ vm_unreserve_address_range(aspace_id aid, void *address, addr_t size) area = addressSpace->virtual_map.areas; while (area) { // the area must be completely part of the reserved range - if (area->id == RESERVED_REGION_ID && area->base >= (addr_t)address + if (area->id == RESERVED_AREA_ID && area->base >= (addr_t)address && area->base + area->size <= (addr_t)address + size) { // remove reserved range vm_area *reserved = area; @@ -1245,7 +1245,7 @@ _vm_put_area(vm_area *area, bool aspaceLocked) bool removeit = false; // we should never get here, but if we do, we can handle it - if (area->id == RESERVED_REGION_ID) + if (area->id == RESERVED_AREA_ID) return; acquire_sem_etc(sAreaHashLock, WRITE_COUNT, 0, 0); @@ -1825,7 +1825,7 @@ vm_delete_areas(struct vm_address_space *aspace) for (area = aspace->virtual_map.areas; area; area = next) { next = area->aspace_next; - if (area->id == RESERVED_REGION_ID) { + if (area->id == RESERVED_AREA_ID) { // just remove it free(area); continue; @@ -1858,7 +1858,7 @@ vm_area_for(aspace_id aid, addr_t address) area = addressSpace->virtual_map.areas; for (; area != NULL; area = area->aspace_next) { // ignore reserved space regions - if (area->id == RESERVED_REGION_ID) + if (area->id == RESERVED_AREA_ID) continue; if (address >= area->base && address < area->base + area->size) { @@ -1919,7 +1919,7 @@ vm_free_unused_boot_loader_range(addr_t start, addr_t size) addr_t areaStart = area->base; addr_t areaEnd = areaStart + area->size; - if (area->id == RESERVED_REGION_ID) + if (area->id == RESERVED_AREA_ID) continue; if (areaEnd >= end) { @@ -2160,7 +2160,7 @@ vm_init_post_sem(kernel_args *args) vm_aspace_init_post_sem(); for (area = kernel_aspace->virtual_map.areas; area; area = area->aspace_next) { - if (area->id == RESERVED_REGION_ID) + if (area->id == RESERVED_AREA_ID) continue; if (area->cache_ref->lock.sem < 0) @@ -2592,7 +2592,7 @@ vm_virtual_map_lookup(vm_virtual_map *map, addr_t address) return area; for (area = map->areas; area != NULL; area = area->aspace_next) { - if (area->id == RESERVED_REGION_ID) + if (area->id == RESERVED_AREA_ID) continue; if (area->base <= address && (area->base + area->size) > address) @@ -2874,7 +2874,7 @@ find_area(const char *name) hash_open(sAreaHash, &iterator); while ((area = hash_next(sAreaHash, &iterator)) != NULL) { - if (area->id == RESERVED_REGION_ID) + if (area->id == RESERVED_AREA_ID) continue; if (!strcmp(area->name, name)) { @@ -2948,7 +2948,7 @@ _get_next_area_info(team_id team, int32 *cookie, area_info *info, size_t size) acquire_sem_etc(addressSpace->virtual_map.sem, READ_COUNT, 0, 0); for (area = addressSpace->virtual_map.areas; area; area = area->aspace_next) { - if (area->id == RESERVED_REGION_ID) + if (area->id == RESERVED_AREA_ID) continue; if (area->base > nextBase) diff --git a/src/system/kernel/vm/vm_daemons.c b/src/system/kernel/vm/vm_daemons.c index 6d15be561b..ee78daef98 100644 --- a/src/system/kernel/vm/vm_daemons.c +++ b/src/system/kernel/vm/vm_daemons.c @@ -54,7 +54,7 @@ scan_pages(vm_address_space *aspace, addr_t free_target) area = firstArea; for (;;) { // ignore reserved ranges - while (area != NULL && area->id == RESERVED_REGION_ID) + while (area != NULL && area->id == RESERVED_AREA_ID) area = area->aspace_next; if (area == NULL) break;