stv0g/eduOS
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'stage5' into stage6

Browse source
This commit is contained in:
Stefan Lankes 2014-12-28 00:33:16 +01:00
commit fc34006203
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mm/memory.c
View file

@ -181,13 +181,15 @@ int memory_init(void)
end_addr = addr + mmap->len;
while ((addr < end_addr) && (addr < (BITMAP_SIZE*8*PAGE_SIZE))) {
page_clear_mark(addr >> PAGE_BITS);
if (page_marked(addr >> PAGE_BITS)) {
page_clear_mark(addr >> PAGE_BITS);
atomic_int32_inc(&total_pages);
atomic_int32_inc(&total_available_pages);
}
addr += PAGE_SIZE;
atomic_int32_inc(&total_pages);
atomic_int32_inc(&total_available_pages);
}
}
mmap++;
mmap = (multiboot_memory_map_t*) ((size_t) mmap + sizeof(uint32_t) + mmap->size);
}
} else if (mb_info->flags & MULTIBOOT_INFO_MEM) {
size_t page;