Mirrors/libhermit
1
0
Fork 0
mirror of https://github.com/hermitcore/libhermit.git synced 2025-03-09 00:00:03 +01:00
Code Issues Releases Wiki Activity

fix the calculation of the available memory

Browse source
This commit is contained in:
Stefan Lankes 2015-07-31 22:10:37 +02:00
parent f5ea0e2d69
commit ade3629df2
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hermit/mm/memory.c
View file

@ -91,6 +91,8 @@ size_t get_pages(size_t npages)
curr = curr->next;
}
out:
//kprintf("get_pages: ret 0%llx, curr->start 0x%llx, curr->end 0x%llx\n", ret, curr->start, curr->end);
spinlock_unlock(&list_lock);
if (ret) {
@ -199,7 +201,7 @@ int memory_init(void)
return ret;
}
kprintf("base 0x%zx, limit 0x%zx\n", base, limit);
kprintf("memory_init: base 0x%zx, limit 0x%zx\n", base, limit);
// mark available memory as free
for(addr=base; addr<limit; addr+=PAGE_SIZE) {
@ -208,13 +210,13 @@ int memory_init(void)
}
// mark kernel as used, we use 2MB pages to map the kernel
for(addr=(size_t) &kernel_start; addr<(((size_t) &kernel_end + 0x200000ULL) & 0xFFFFFFFFFFE00000ULL); addr+=PAGE_SIZE) {
for(addr=base; addr<((base + 0x200000ULL) & 0xFFFFFFFFFFE00000ULL); addr+=PAGE_SIZE) {
atomic_int64_inc(&total_allocated_pages);
atomic_int64_dec(&total_available_pages);
}
//initialize free list
init_list.start = ((size_t) &kernel_end + 0x200000ULL) & 0xFFFFFFFFFFE00000ULL;
init_list.start = (base + 0x200000ULL) & 0xFFFFFFFFFFE00000ULL;
init_list.end = limit;
init_list.prev = init_list.next = NULL;