diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-31 16:24:24 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-31 16:24:24 -0600 |
| commit | 229ba49e4c56097c393d2e5fa9e77de80ce55a75 (patch) | |
| tree | 4842535e4d2e0c4ef983d6be8e33a68c3d74c554 /nuttx/binfmt | |
| parent | 08835af3d68a4ea82ec32a5fe29608a6233eb9d9 (diff) | |
| download | px4-nuttx-229ba49e4c56097c393d2e5fa9e77de80ce55a75.tar.gz px4-nuttx-229ba49e4c56097c393d2e5fa9e77de80ce55a75.tar.bz2 px4-nuttx-229ba49e4c56097c393d2e5fa9e77de80ce55a75.zip | |
Rename kumalloc to kumm_malloc and kuzalloc to kumm_zalloc for consistency with other naming
Diffstat (limited to 'nuttx/binfmt')
| -rw-r--r-- | nuttx/binfmt/binfmt_execmodule.c | 2 | ||||
| -rw-r--r-- | nuttx/binfmt/libelf/libelf_addrenv.c | 2 | ||||
| -rw-r--r-- | nuttx/binfmt/libelf/libelf_ctors.c | 2 | ||||
| -rw-r--r-- | nuttx/binfmt/libelf/libelf_dtors.c | 2 | ||||
| -rw-r--r-- | nuttx/binfmt/libnxflat/libnxflat_addrenv.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/binfmt/binfmt_execmodule.c b/nuttx/binfmt/binfmt_execmodule.c index c9e16818e..34e8f30ac 100644 --- a/nuttx/binfmt/binfmt_execmodule.c +++ b/nuttx/binfmt/binfmt_execmodule.c @@ -166,7 +166,7 @@ int exec_module(FAR const struct binary_s *binp) #ifndef CONFIG_CUSTOM_STACK /* Allocate the stack for the new task (always from the user heap) */ - stack = (FAR uint32_t*)kumalloc(binp->stacksize); + stack = (FAR uint32_t*)kumm_malloc(binp->stacksize); if (!tcb) { err = ENOMEM; diff --git a/nuttx/binfmt/libelf/libelf_addrenv.c b/nuttx/binfmt/libelf/libelf_addrenv.c index 66479bf42..cdcc5b77f 100644 --- a/nuttx/binfmt/libelf/libelf_addrenv.c +++ b/nuttx/binfmt/libelf/libelf_addrenv.c @@ -129,7 +129,7 @@ int elf_addrenv_alloc(FAR struct elf_loadinfo_s *loadinfo, size_t textsize, #else /* Allocate memory to hold the ELF image */ - loadinfo->textalloc = (uintptr_t)kuzalloc(textsize + datasize); + loadinfo->textalloc = (uintptr_t)kumm_zalloc(textsize + datasize); if (!loadinfo->textalloc) { return -ENOMEM; diff --git a/nuttx/binfmt/libelf/libelf_ctors.c b/nuttx/binfmt/libelf/libelf_ctors.c index 6cf35a62a..89bd087c8 100644 --- a/nuttx/binfmt/libelf/libelf_ctors.c +++ b/nuttx/binfmt/libelf/libelf_ctors.c @@ -163,7 +163,7 @@ int elf_loadctors(FAR struct elf_loadinfo_s *loadinfo) { /* Allocate memory to hold a copy of the .ctor section */ - loadinfo->ctoralloc = (binfmt_ctor_t*)kumalloc(ctorsize); + loadinfo->ctoralloc = (binfmt_ctor_t*)kumm_malloc(ctorsize); if (!loadinfo->ctoralloc) { bdbg("Failed to allocate memory for .ctors\n"); diff --git a/nuttx/binfmt/libelf/libelf_dtors.c b/nuttx/binfmt/libelf/libelf_dtors.c index e42ba6abf..e99c7cc9d 100644 --- a/nuttx/binfmt/libelf/libelf_dtors.c +++ b/nuttx/binfmt/libelf/libelf_dtors.c @@ -163,7 +163,7 @@ int elf_loaddtors(FAR struct elf_loadinfo_s *loadinfo) { /* Allocate memory to hold a copy of the .dtor section */ - loadinfo->ctoralloc = (binfmt_dtor_t*)kumalloc(dtorsize); + loadinfo->ctoralloc = (binfmt_dtor_t*)kumm_malloc(dtorsize); if (!loadinfo->ctoralloc) { bdbg("Failed to allocate memory for .dtors\n"); diff --git a/nuttx/binfmt/libnxflat/libnxflat_addrenv.c b/nuttx/binfmt/libnxflat/libnxflat_addrenv.c index 1690d0ae0..d5abc452d 100644 --- a/nuttx/binfmt/libnxflat/libnxflat_addrenv.c +++ b/nuttx/binfmt/libnxflat/libnxflat_addrenv.c @@ -162,7 +162,7 @@ errout_with_dspace: #else /* Allocate (and zero) memory to hold the ELF image */ - dspace->region = (FAR uint8_t *)kuzalloc(envsize); + dspace->region = (FAR uint8_t *)kumm_zalloc(envsize); if (!dspace->region) { kfree(dspace); |