You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gu...@apache.org on 2021/10/19 01:51:27 UTC
[incubator-nuttx] branch master updated: binfmt: Remove
umm_initialize from elf_load
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 9e60c33 binfmt: Remove umm_initialize from elf_load
9e60c33 is described below
commit 9e60c33d4dfeea75394642668997b0ad50b7b0fb
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Fri Oct 15 02:21:10 2021 +0800
binfmt: Remove umm_initialize from elf_load
since umm_try_initialize will do it automatically
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
binfmt/libelf/libelf_load.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/binfmt/libelf/libelf_load.c b/binfmt/libelf/libelf_load.c
index e2c8d39..943a5f6 100644
--- a/binfmt/libelf/libelf_load.c
+++ b/binfmt/libelf/libelf_load.c
@@ -37,7 +37,6 @@
#include <nuttx/arch.h>
#include <nuttx/addrenv.h>
#include <nuttx/elf.h>
-#include <nuttx/mm/mm.h>
#include <nuttx/binfmt/elf.h>
#include "libelf.h"
@@ -291,13 +290,6 @@ int elf_load(FAR struct elf_loadinfo_s *loadinfo)
berr("ERROR: elf_addrenv_select() failed: %d\n", ret);
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 */