From 48160dc5ebfa8ade5417db66d7d74fa278e43e8b Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Wed, 18 Jan 2017 11:55:06 +0100 Subject: [PATCH 1/4] install deb packet, which tarvis has been created --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0d84a836b..941f82459 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ 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 deploy: on: production From 3448987490745a396a1737c4035c22167e84c6d1 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Wed, 18 Jan 2017 12:09:39 +0100 Subject: [PATCH 2/4] add auto-generated makefiles to the list of ignored files --- .gitignore | 3 +++ usr/libomp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e313af817..79f00c766 100644 --- a/.gitignore +++ b/.gitignore @@ -45,4 +45,7 @@ usr/openmpbench/syncbench usr/openmpbench/taskbench usr/x86/ usr/tmp/ +tools/Makefile +usr/ircce/Makefile +usr/xray/Makefile arch/x86/kernel/boot.h diff --git a/usr/libomp b/usr/libomp index e7ea3a270..2046fa1ea 160000 --- a/usr/libomp +++ b/usr/libomp @@ -1 +1 @@ -Subproject commit e7ea3a270fc09f771596c02869344a362c8c5439 +Subproject commit 2046fa1ea1587ba862e54e797433e1d726ab6ba8 From 01c092c19f0a47a4de87dae77e5bc11d83e7972c Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Wed, 18 Jan 2017 12:56:19 +0100 Subject: [PATCH 3/4] build also all examples --- .travis.yml | 1 + mm/memory.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 941f82459..7619680c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ script: - cd libhermit-0.1 - debuild -e PATH -us -uc -j2 - sudo dpkg -i ../libhermit*_amd64.deb + - make -j2 examples deploy: on: production diff --git a/mm/memory.c b/mm/memory.c index 3bf6b945c..940987093 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -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; From 8eb427e7714f2f1e55a1726ec4994da49b912468 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Wed, 18 Jan 2017 13:24:41 +0100 Subject: [PATCH 4/4] fix path to the syscall header --- usr/tests/signals.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/tests/signals.c b/usr/tests/signals.c index 2251ca331..70687759d 100644 --- a/usr/tests/signals.c +++ b/usr/tests/signals.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #define THREAD_COUNT_DEFAULT 2