Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed tracing build.

Browse Source 
* In reserve_boot_loader_ranges() we skip ranges that lie without
  the kernel address space (we failed and panic()ed before). The
  architecture specific code has to deal with those, if they are
  of any importance.
* sAvailableMemoryLock.sem was not set to -1 in vm_init() so code
  executed after semaphores were available but before the semaphore
  was created caused semaphore 0 to be acquired.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15889 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2006-01-10 02:22:24 +00:00
parent 1cf0c3b3f2
commit 1777154c14
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/system/kernel/vm/vm.cpp
View File

@ -272,8 +272,9 @@ find_and_insert_area_slot(vm_address_space *addressSpace, addr_t start,
vm_area *next; vm_area *next;
bool foundSpot = false; bool foundSpot = false;
TRACE(("find_and_insert_region_slot: map %p, start 0x%lx, size %ld, end 0x%lx, addressSpec %ld, area %p\n", TRACE(("find_and_insert_region_slot: address space %p, start 0x%lx, "
map, start, size, end, addressSpec, area)); "size %ld, end 0x%lx, addressSpec %ld, area %p\n", addressSpace, start,
size, end, addressSpec, area));
// do some sanity checking // do some sanity checking
if (start < addressSpace->base || size == 0 if (start < addressSpace->base || size == 0
@ -2164,6 +2165,15 @@ reserve_boot_loader_ranges(kernel_args *args)
for (i = 0; i < args->num_virtual_allocated_ranges; i++) { for (i = 0; i < args->num_virtual_allocated_ranges; i++) {
void *address = (void *)args->virtual_allocated_range[i].start; void *address = (void *)args->virtual_allocated_range[i].start;
// If the address is no kernel address, we just skip it. The
// architecture specific code has to deal with it.
if (!IS_KERNEL_ADDRESS(address)) {
dprintf("reserve_boot_loader_ranges(): Skipping range: %p, %lu\n",
address, args->virtual_allocated_range[i].size);
continue;
}
status_t status = vm_reserve_address_range(vm_kernel_address_space_id(), &address, status_t status = vm_reserve_address_range(vm_kernel_address_space_id(), &address,
B_EXACT_ADDRESS, args->virtual_allocated_range[i].size, 0); B_EXACT_ADDRESS, args->virtual_allocated_range[i].size, 0);
if (status < B_OK) if (status < B_OK)
@ -2188,6 +2198,7 @@ vm_init(kernel_args *args)
// initialize some globals // initialize some globals
sNextAreaID = 1; sNextAreaID = 1;
sAreaHashLock = -1; sAreaHashLock = -1;
sAvailableMemoryLock.sem = -1;
// map in the new heap and initialize it // map in the new heap and initialize it
heap_base = vm_alloc_from_kernel_args(args, HEAP_SIZE, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA); heap_base = vm_alloc_from_kernel_args(args, HEAP_SIZE, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA);