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:34:29 +01:00
commit 95f0df5615
5 changed files with 18 additions and 4 deletions

3
.gitignore vendored
View file

@ -44,6 +44,9 @@ usr/openmpbench/schedbench
usr/openmpbench/syncbench
usr/openmpbench/taskbench
usr/tmp/
tools/Makefile
usr/ircce/Makefile
usr/xray/Makefile
arch/x86/kernel/boot.h
usr/binutils/
usr/gcc/

View file

@ -18,7 +18,8 @@ script:
- tar -czf libhermit_0.1.orig.tar.gz libhermit-0.1 --exclude=.git
- cd libhermit-0.1
- debuild -e PATH -us -uc -j2
- x86_64-hermit-readelf -a kernel/main.o | grep ABI
- sudo dpkg -i ../libhermit*_amd64.deb
- make -j2 examples
deploy:
on: production

View file

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

@ -1 +1 @@
Subproject commit e7ea3a270fc09f771596c02869344a362c8c5439
Subproject commit 2046fa1ea1587ba862e54e797433e1d726ab6ba8

View file

@ -29,7 +29,7 @@
#include <errno.h>
#include <signal.h>
#include <pthread.h>
#include <syscall.h>
#include <hermit/syscall.h>
#define THREAD_COUNT_DEFAULT 2