1
0
Fork 0
mirror of https://github.com/hermitcore/libhermit.git synced 2025-03-09 00:00:03 +01:00

Merge branch 'production' into devel

This commit is contained in:
Stefan Lankes 2017-01-19 21:43:06 +01:00
commit cd3ef764c3

View file

@ -272,17 +272,7 @@ int memory_init(void)
LOG_INFO("Free region 0x%zx - 0x%zx\n", start_addr, end_addr);
if ((start_addr <= base) && (end_addr <= base)) {
init_list.start = start_addr;
init_list.end = end_addr;
LOG_INFO("Add region 0x%zx - 0x%zx\n", init_list.start, init_list.end);
} else if ((start_addr <= base) && (end_addr < PAGE_2M_FLOOR(base+image_size))) {
init_list.start = start_addr;
init_list.end = base;
LOG_INFO("Add region 0x%zx - 0x%zx\n", init_list.start, init_list.end);
} else if ((start_addr <= base) && (end_addr >= PAGE_2M_FLOOR(base+image_size))) {
if ((start_addr <= base) && (end_addr >= PAGE_2M_FLOOR(base+image_size))) {
init_list.start = PAGE_2M_FLOOR(base+image_size);
init_list.end = end_addr;