From c17145e5507762d21aa4eba5f8cd8a8ba3738b03 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 3 Feb 2019 18:08:46 -0600 Subject: [PATCH] Revert "binfmt/libelf/libelf_load.c: Remove the guard(CONFIG_BUILD_KERNEL) for umm_initialize()" This commit has to be reverted because it causes errors in build testing. This reverts commit b9c7a9a18f26c49e08f4af4612a8966ca2a29cdb. --- binfmt/libelf/libelf_load.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/binfmt/libelf/libelf_load.c b/binfmt/libelf/libelf_load.c index 5fa24ccffb..7b4dbae0ba 100644 --- a/binfmt/libelf/libelf_load.c +++ b/binfmt/libelf/libelf_load.c @@ -304,10 +304,12 @@ int elf_load(FAR struct elf_loadinfo_s *loadinfo) goto errout_with_buffers; } +#ifdef CONFIG_BUILD_KERNEL /* Initialize the user heap */ umm_initialize((FAR void *)CONFIG_ARCH_HEAP_VBASE, up_addrenv_heapsize(&loadinfo->addrenv)); +#endif #endif /* Load ELF section data into memory */