From 276c1431d62548803a68906faba81cf947d2e77d Mon Sep 17 00:00:00 2001 From: Stewart Smith Date: Wed, 23 Aug 2017 11:00:29 +1000 Subject: test/mem_region: fix incorrect ibm,os-reserve region length We were reserving all of memory up to the heap, which is fine *unless* the system libc chooses to allocate something in that block of memory that we use, which means we have overlapping regions and general pain. This should fix failing unit tests on some systems (e.g. Debian) Signed-off-by: Stewart Smith --- core/test/run-mem_region_release_unused.c | 2 +- core/test/run-mem_region_release_unused_noalloc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'core') diff --git a/core/test/run-mem_region_release_unused.c b/core/test/run-mem_region_release_unused.c index 886585b..712f98a 100644 --- a/core/test/run-mem_region_release_unused.c +++ b/core/test/run-mem_region_release_unused.c @@ -113,7 +113,7 @@ int main(void) /* Use malloc for the heap, so valgrind can find issues. */ skiboot_heap.start = (unsigned long)malloc(TEST_HEAP_SIZE); skiboot_heap.len = TEST_HEAP_SIZE; - skiboot_os_reserve.len = skiboot_heap.start; + skiboot_os_reserve.len = 0; dt_root = dt_new_root(""); dt_add_property_cells(dt_root, "#address-cells", 2); diff --git a/core/test/run-mem_region_release_unused_noalloc.c b/core/test/run-mem_region_release_unused_noalloc.c index 2a9f641..a79485b 100644 --- a/core/test/run-mem_region_release_unused_noalloc.c +++ b/core/test/run-mem_region_release_unused_noalloc.c @@ -110,9 +110,10 @@ int main(void) const char *last; /* Use malloc for the heap, so valgrind can find issues. */ - skiboot_heap.start = (unsigned long)malloc(TEST_HEAP_SIZE); + skiboot_heap.start = 0; skiboot_heap.len = TEST_HEAP_SIZE; - skiboot_os_reserve.len = skiboot_heap.start; + skiboot_os_reserve.start = 0; + skiboot_os_reserve.len = 0; dt_root = dt_new_root(""); dt_add_property_cells(dt_root, "#address-cells", 2); @@ -163,6 +164,5 @@ int main(void) } dt_free(dt_root); - free((void *)(long)skiboot_heap.start); return 0; } -- cgit v1.1