summaryrefslogtreecommitdiff
path: root/nuttx
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-08-31 16:24:24 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-08-31 16:24:24 -0600
commit229ba49e4c56097c393d2e5fa9e77de80ce55a75 (patch)
tree4842535e4d2e0c4ef983d6be8e33a68c3d74c554 /nuttx
parent08835af3d68a4ea82ec32a5fe29608a6233eb9d9 (diff)
downloadnuttx-229ba49e4c56097c393d2e5fa9e77de80ce55a75.tar.gz
nuttx-229ba49e4c56097c393d2e5fa9e77de80ce55a75.tar.bz2
nuttx-229ba49e4c56097c393d2e5fa9e77de80ce55a75.zip
Rename kumalloc to kumm_malloc and kuzalloc to kumm_zalloc for consistency with other naming
Diffstat (limited to 'nuttx')
-rw-r--r--nuttx/arch/arm/src/common/up_createstack.c4
-rwxr-xr-xnuttx/arch/arm/src/lpc31xx/lpc31_ehci.c4
-rw-r--r--nuttx/arch/arm/src/sam34/sam_udp.c2
-rwxr-xr-xnuttx/arch/arm/src/sama5/sam_ehci.c4
-rw-r--r--nuttx/arch/arm/src/sama5/sam_ohci.c6
-rw-r--r--nuttx/arch/arm/src/sama5/sam_udphs.c2
-rw-r--r--nuttx/arch/avr/src/avr/up_createstack.c4
-rw-r--r--nuttx/arch/avr/src/avr32/up_createstack.c4
-rw-r--r--nuttx/arch/hc/src/common/up_createstack.c4
-rw-r--r--nuttx/arch/mips/src/common/up_createstack.c4
-rw-r--r--nuttx/arch/rgmp/src/nuttx.c2
-rw-r--r--nuttx/arch/sh/src/common/up_createstack.c4
-rw-r--r--nuttx/arch/sim/src/up_createstack.c2
-rw-r--r--nuttx/arch/x86/src/i486/up_createstack.c4
-rw-r--r--nuttx/arch/z16/src/common/up_createstack.c4
-rw-r--r--nuttx/arch/z80/src/common/up_createstack.c4
-rw-r--r--nuttx/audio/audio.c2
-rw-r--r--nuttx/audio/pcm_decode.c2
-rw-r--r--nuttx/binfmt/binfmt_execmodule.c2
-rw-r--r--nuttx/binfmt/libelf/libelf_addrenv.c2
-rw-r--r--nuttx/binfmt/libelf/libelf_ctors.c2
-rw-r--r--nuttx/binfmt/libelf/libelf_dtors.c2
-rw-r--r--nuttx/binfmt/libnxflat/libnxflat_addrenv.c2
-rw-r--r--nuttx/fs/fs_fdopen.c2
-rw-r--r--nuttx/fs/fs_opendir.c4
-rw-r--r--nuttx/fs/mmap/fs_rammap.c2
-rw-r--r--nuttx/graphics/nxsu/nx_open.c2
-rw-r--r--nuttx/graphics/nxsu/nx_openwindow.c2
-rw-r--r--nuttx/include/nuttx/audio/audio.h2
-rw-r--r--nuttx/include/nuttx/kmalloc.h8
-rw-r--r--nuttx/libc/lib_internal.h4
-rw-r--r--nuttx/libnx/nxcontext.h4
-rw-r--r--nuttx/sched/environ/env_dup.c2
-rw-r--r--nuttx/sched/environ/env_setenv.c2
-rw-r--r--nuttx/sched/group/group_create.c2
35 files changed, 54 insertions, 54 deletions
diff --git a/nuttx/arch/arm/src/common/up_createstack.c b/nuttx/arch/arm/src/common/up_createstack.c
index 38170e228..a34612753 100644
--- a/nuttx/arch/arm/src/common/up_createstack.c
+++ b/nuttx/arch/arm/src/common/up_createstack.c
@@ -174,9 +174,9 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
/* Use the user-space allocator if this is a task or pthread */
#if defined(CONFIG_DEBUG) && !defined(CONFIG_DEBUG_STACK)
- tcb->stack_alloc_ptr = (uint32_t *)kuzalloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t *)kumm_zalloc(stack_size);
#else
- tcb->stack_alloc_ptr = (uint32_t *)kumalloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
#endif
}
diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_ehci.c b/nuttx/arch/arm/src/lpc31xx/lpc31_ehci.c
index 2af7e0c13..8f0091f8a 100755
--- a/nuttx/arch/arm/src/lpc31xx/lpc31_ehci.c
+++ b/nuttx/arch/arm/src/lpc31xx/lpc31_ehci.c
@@ -3773,7 +3773,7 @@ static int lpc31_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
* Some hardware supports special memory in which larger IO buffers can
* be accessed more efficiently. This method provides a mechanism to allocate
* the request/descriptor memory. If the underlying hardware does not support
- * such "special" memory, this functions may simply map to kumalloc.
+ * such "special" memory, this functions may simply map to kumm_malloc.
*
* This interface differs from DRVR_ALLOC in that the buffers are variable-sized.
*
@@ -3802,7 +3802,7 @@ static int lpc31_ioalloc(FAR struct usbhost_driver_s *drvr, FAR uint8_t **buffer
* accessible (depending on how the class driver implements its buffering).
*/
- *buffer = (FAR uint8_t *)kumalloc(buflen);
+ *buffer = (FAR uint8_t *)kumm_malloc(buflen);
return *buffer ? OK : -ENOMEM;
}
diff --git a/nuttx/arch/arm/src/sam34/sam_udp.c b/nuttx/arch/arm/src/sam34/sam_udp.c
index 4b30c4afd..a502fb35b 100644
--- a/nuttx/arch/arm/src/sam34/sam_udp.c
+++ b/nuttx/arch/arm/src/sam34/sam_udp.c
@@ -3035,7 +3035,7 @@ static void *sam_ep_allocbuffer(struct usbdev_ep_s *ep, uint16_t nbytes)
{
/* There is not special buffer allocation requirement */
- return kumalloc(nbytes);
+ return kumm_malloc(nbytes);
}
#endif
diff --git a/nuttx/arch/arm/src/sama5/sam_ehci.c b/nuttx/arch/arm/src/sama5/sam_ehci.c
index f3e8e6887..72dfd347a 100755
--- a/nuttx/arch/arm/src/sama5/sam_ehci.c
+++ b/nuttx/arch/arm/src/sama5/sam_ehci.c
@@ -3613,7 +3613,7 @@ static int sam_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
* Some hardware supports special memory in which larger IO buffers can
* be accessed more efficiently. This method provides a mechanism to allocate
* the request/descriptor memory. If the underlying hardware does not support
- * such "special" memory, this functions may simply map to kumalloc.
+ * such "special" memory, this functions may simply map to kumm_malloc.
*
* This interface differs from DRVR_ALLOC in that the buffers are variable-sized.
*
@@ -3642,7 +3642,7 @@ static int sam_ioalloc(FAR struct usbhost_driver_s *drvr, FAR uint8_t **buffer,
* accessible (depending on how the class driver implements its buffering).
*/
- *buffer = (FAR uint8_t *)kumalloc(buflen);
+ *buffer = (FAR uint8_t *)kumm_malloc(buflen);
return *buffer ? OK : -ENOMEM;
}
diff --git a/nuttx/arch/arm/src/sama5/sam_ohci.c b/nuttx/arch/arm/src/sama5/sam_ohci.c
index f946fb138..735d2c7b1 100644
--- a/nuttx/arch/arm/src/sama5/sam_ohci.c
+++ b/nuttx/arch/arm/src/sama5/sam_ohci.c
@@ -2677,7 +2677,7 @@ static int sam_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
* Some hardware supports special memory in which larger IO buffers can
* be accessed more efficiently. This method provides a mechanism to allocate
* the request/descriptor memory. If the underlying hardware does not support
- * such "special" memory, this functions may simply map to kumalloc.
+ * such "special" memory, this functions may simply map to kumm_malloc.
*
* This interface differs from DRVR_ALLOC in that the buffers are variable-sized.
*
@@ -2702,9 +2702,9 @@ static int sam_ioalloc(FAR struct usbhost_driver_s *drvr, FAR uint8_t **buffer,
{
DEBUGASSERT(drvr && buffer);
- /* kumalloc() should return user accessible, DMA-able memory */
+ /* kumm_malloc() should return user accessible, DMA-able memory */
- *buffer = kumalloc(buflen);
+ *buffer = kumm_malloc(buflen);
return *buffer ? OK : -ENOMEM;
}
diff --git a/nuttx/arch/arm/src/sama5/sam_udphs.c b/nuttx/arch/arm/src/sama5/sam_udphs.c
index cc6c86b1c..afc38280c 100644
--- a/nuttx/arch/arm/src/sama5/sam_udphs.c
+++ b/nuttx/arch/arm/src/sama5/sam_udphs.c
@@ -3524,7 +3524,7 @@ static void *sam_ep_allocbuffer(struct usbdev_ep_s *ep, uint16_t nbytes)
{
/* There is not special buffer allocation requirement */
- return kumalloc(nbytes);
+ return kumm_malloc(nbytes);
}
#endif
diff --git a/nuttx/arch/avr/src/avr/up_createstack.c b/nuttx/arch/avr/src/avr/up_createstack.c
index d14ec63fd..4b7df816b 100644
--- a/nuttx/arch/avr/src/avr/up_createstack.c
+++ b/nuttx/arch/avr/src/avr/up_createstack.c
@@ -121,9 +121,9 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
*/
#if defined(CONFIG_DEBUG) && !defined(CONFIG_DEBUG_STACK)
- tcb->stack_alloc_ptr = (uint32_t *)kuzalloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t *)kumm_zalloc(stack_size);
#else
- tcb->stack_alloc_ptr = (uint32_t *)kumalloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
#endif
#ifdef CONFIG_DEBUG
diff --git a/nuttx/arch/avr/src/avr32/up_createstack.c b/nuttx/arch/avr/src/avr32/up_createstack.c
index 9082d796f..10895e98f 100644
--- a/nuttx/arch/avr/src/avr32/up_createstack.c
+++ b/nuttx/arch/avr/src/avr32/up_createstack.c
@@ -141,9 +141,9 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
/* Use the user-space allocator if this is a task or pthread */
#if defined(CONFIG_DEBUG) && !defined(CONFIG_DEBUG_STACK)
- tcb->stack_alloc_ptr = (uint32_t *)kuzalloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t *)kumm_zalloc(stack_size);
#else
- tcb->stack_alloc_ptr = (uint32_t *)kumalloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
#endif
}
diff --git a/nuttx/arch/hc/src/common/up_createstack.c b/nuttx/arch/hc/src/common/up_createstack.c
index ea542d985..339ea3c77 100644
--- a/nuttx/arch/hc/src/common/up_createstack.c
+++ b/nuttx/arch/hc/src/common/up_createstack.c
@@ -138,9 +138,9 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
/* Use the user-space allocator if this is a task or pthread */
#if defined(CONFIG_DEBUG) && !defined(CONFIG_DEBUG_STACK)
- tcb->stack_alloc_ptr = (uint32_t *)kuzalloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t *)kumm_zalloc(stack_size);
#else
- tcb->stack_alloc_ptr = (uint32_t *)kumalloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
#endif
}
diff --git a/nuttx/arch/mips/src/common/up_createstack.c b/nuttx/arch/mips/src/common/up_createstack.c
index 92b99842a..940071d18 100644
--- a/nuttx/arch/mips/src/common/up_createstack.c
+++ b/nuttx/arch/mips/src/common/up_createstack.c
@@ -159,9 +159,9 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
/* Use the user-space allocator if this is a task or pthread */
#if defined(CONFIG_DEBUG) && !defined(CONFIG_DEBUG_STACK)
- tcb->stack_alloc_ptr = (uint32_t *)kuzalloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t *)kumm_zalloc(stack_size);
#else
- tcb->stack_alloc_ptr = (uint32_t *)kumalloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
#endif
}
diff --git a/nuttx/arch/rgmp/src/nuttx.c b/nuttx/arch/rgmp/src/nuttx.c
index 579acab15..b2c1bd3e2 100644
--- a/nuttx/arch/rgmp/src/nuttx.c
+++ b/nuttx/arch/rgmp/src/nuttx.c
@@ -134,7 +134,7 @@ int up_create_stack(struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
} else
#endif
{
- stack_alloc_ptr = (uint32_t*)kumalloc(adj_stack_size);
+ stack_alloc_ptr = (uint32_t*)kumm_malloc(adj_stack_size);
}
if (stack_alloc_ptr) {
/* This is the address of the last word in the allocation */
diff --git a/nuttx/arch/sh/src/common/up_createstack.c b/nuttx/arch/sh/src/common/up_createstack.c
index 03808f765..04a0a44ec 100644
--- a/nuttx/arch/sh/src/common/up_createstack.c
+++ b/nuttx/arch/sh/src/common/up_createstack.c
@@ -138,9 +138,9 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
/* Use the user-space allocator if this is a task or pthread */
#if defined(CONFIG_DEBUG) && !defined(CONFIG_DEBUG_STACK)
- tcb->stack_alloc_ptr = (uint32_t *)kuzalloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t *)kumm_zalloc(stack_size);
#else
- tcb->stack_alloc_ptr = (uint32_t *)kumalloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
#endif
}
diff --git a/nuttx/arch/sim/src/up_createstack.c b/nuttx/arch/sim/src/up_createstack.c
index 07a8efc15..0587ae05e 100644
--- a/nuttx/arch/sim/src/up_createstack.c
+++ b/nuttx/arch/sim/src/up_createstack.c
@@ -107,7 +107,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
/* Allocate the memory for the stack */
- stack_alloc_ptr = (uint32_t*)kumalloc(adj_stack_size);
+ stack_alloc_ptr = (uint32_t*)kumm_malloc(adj_stack_size);
/* Was the allocation successful? */
diff --git a/nuttx/arch/x86/src/i486/up_createstack.c b/nuttx/arch/x86/src/i486/up_createstack.c
index 6b02e4464..4c915e618 100644
--- a/nuttx/arch/x86/src/i486/up_createstack.c
+++ b/nuttx/arch/x86/src/i486/up_createstack.c
@@ -140,9 +140,9 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
/* Use the user-space allocator if this is a task or pthread */
#if defined(CONFIG_DEBUG) && !defined(CONFIG_DEBUG_STACK)
- tcb->stack_alloc_ptr = (uint32_t *)kuzalloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t *)kumm_zalloc(stack_size);
#else
- tcb->stack_alloc_ptr = (uint32_t *)kumalloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
#endif
}
diff --git a/nuttx/arch/z16/src/common/up_createstack.c b/nuttx/arch/z16/src/common/up_createstack.c
index 5daf8cc76..42df4d0c2 100644
--- a/nuttx/arch/z16/src/common/up_createstack.c
+++ b/nuttx/arch/z16/src/common/up_createstack.c
@@ -118,9 +118,9 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
*/
#if defined(CONFIG_DEBUG) && !defined(CONFIG_DEBUG_STACK)
- tcb->stack_alloc_ptr = (uint32_t *)kuzalloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t *)kumm_zalloc(stack_size);
#else
- tcb->stack_alloc_ptr = (uint32_t *)kumalloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
#endif
#ifdef CONFIG_DEBUG
diff --git a/nuttx/arch/z80/src/common/up_createstack.c b/nuttx/arch/z80/src/common/up_createstack.c
index 1b7506673..05d42b325 100644
--- a/nuttx/arch/z80/src/common/up_createstack.c
+++ b/nuttx/arch/z80/src/common/up_createstack.c
@@ -138,9 +138,9 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
/* Use the user-space allocator if this is a task or pthread */
#if defined(CONFIG_DEBUG) && !defined(CONFIG_DEBUG_STACK)
- tcb->stack_alloc_ptr = (uint32_t *)kuzalloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t *)kumm_zalloc(stack_size);
#else
- tcb->stack_alloc_ptr = (uint32_t *)kumalloc(stack_size);
+ tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
#endif
}
diff --git a/nuttx/audio/audio.c b/nuttx/audio/audio.c
index 252531677..3f0c9ebfb 100644
--- a/nuttx/audio/audio.c
+++ b/nuttx/audio/audio.c
@@ -530,7 +530,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
}
else
{
- /* Perform a simple kumalloc operation assuming 1 session */
+ /* Perform a simple kumm_malloc operation assuming 1 session */
ret = apb_alloc(bufdesc);
}
diff --git a/nuttx/audio/pcm_decode.c b/nuttx/audio/pcm_decode.c
index b2109923c..f15f63a88 100644
--- a/nuttx/audio/pcm_decode.c
+++ b/nuttx/audio/pcm_decode.c
@@ -949,7 +949,7 @@ static int pcm_resume(FAR struct audio_lowerhalf_s *dev)
* lower-half driver with the opportunity to perform special buffer
* allocation if needed, such as allocating from a specific memory
* region (DMA-able, etc.). If not supplied, then the top-half
- * driver will perform a standard kumalloc using normal user-space
+ * driver will perform a standard kumm_malloc using normal user-space
* memory region.
*
****************************************************************************/
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);
diff --git a/nuttx/fs/fs_fdopen.c b/nuttx/fs/fs_fdopen.c
index 5356ae03d..3a474717f 100644
--- a/nuttx/fs/fs_fdopen.c
+++ b/nuttx/fs/fs_fdopen.c
@@ -228,7 +228,7 @@ FAR struct file_struct *fs_fdopen(int fd, int oflags, FAR struct tcb_s *tcb)
/* Allocate the IO buffer */
- stream->fs_bufstart = kumalloc(CONFIG_STDIO_BUFFER_SIZE);
+ stream->fs_bufstart = kumm_malloc(CONFIG_STDIO_BUFFER_SIZE);
if (!stream->fs_bufstart)
{
err = ENOMEM;
diff --git a/nuttx/fs/fs_opendir.c b/nuttx/fs/fs_opendir.c
index a74c776d1..637b4253f 100644
--- a/nuttx/fs/fs_opendir.c
+++ b/nuttx/fs/fs_opendir.c
@@ -180,7 +180,7 @@ static inline void open_emptydir(FAR struct fs_dirent_s *dir)
* at the end of the list.
*/
-#if 0 /* Already nullified by kuzalloc */
+#if 0 /* Already nullified by kumm_zalloc */
dir->fd_root = NULL; /* Save the inode where we start */
dir->u.pseudo.fd_next = NULL; /* We are at the end of the list */
#endif
@@ -270,7 +270,7 @@ FAR DIR *opendir(FAR const char *path)
* container.
*/
- dir = (FAR struct fs_dirent_s *)kuzalloc(sizeof(struct fs_dirent_s));
+ dir = (FAR struct fs_dirent_s *)kumm_zalloc(sizeof(struct fs_dirent_s));
if (!dir)
{
/* Insufficient memory to complete the operation.*/
diff --git a/nuttx/fs/mmap/fs_rammap.c b/nuttx/fs/mmap/fs_rammap.c
index f0335f4a8..04e08fb66 100644
--- a/nuttx/fs/mmap/fs_rammap.c
+++ b/nuttx/fs/mmap/fs_rammap.c
@@ -139,7 +139,7 @@ FAR void *rammap(int fd, size_t length, off_t offset)
/* Allocate a region of memory of the specified size */
- alloc = (FAR uint8_t *)kumalloc(sizeof(struct fs_rammap_s) + length);
+ alloc = (FAR uint8_t *)kumm_malloc(sizeof(struct fs_rammap_s) + length);
if (!alloc)
{
fdbg("Region allocation failed, length: %d\n", (int)length);
diff --git a/nuttx/graphics/nxsu/nx_open.c b/nuttx/graphics/nxsu/nx_open.c
index 0de1159ae..5da6b7ad8 100644
--- a/nuttx/graphics/nxsu/nx_open.c
+++ b/nuttx/graphics/nxsu/nx_open.c
@@ -199,7 +199,7 @@ NXHANDLE nx_open(FAR NX_DRIVERTYPE *dev)
* (if available) for compatibility with the multi-user implementation.
*/
- fe = (FAR struct nxfe_state_s *)kuzalloc(sizeof(struct nxfe_state_s));
+ fe = (FAR struct nxfe_state_s *)kumm_zalloc(sizeof(struct nxfe_state_s));
if (!fe)
{
errno = ENOMEM;
diff --git a/nuttx/graphics/nxsu/nx_openwindow.c b/nuttx/graphics/nxsu/nx_openwindow.c
index 4c4afa35b..cc1f5d38f 100644
--- a/nuttx/graphics/nxsu/nx_openwindow.c
+++ b/nuttx/graphics/nxsu/nx_openwindow.c
@@ -107,7 +107,7 @@ NXWINDOW nx_openwindow(NXHANDLE handle, FAR const struct nx_callback_s *cb,
* available) for compatibility with the multi-user implementation.
*/
- wnd = (FAR struct nxbe_window_s *)kuzalloc(sizeof(struct nxbe_window_s));
+ wnd = (FAR struct nxbe_window_s *)kumm_zalloc(sizeof(struct nxbe_window_s));
if (!wnd)
{
errno = ENOMEM;
diff --git a/nuttx/include/nuttx/audio/audio.h b/nuttx/include/nuttx/audio/audio.h
index 78fc1944e..b1cfc9d0a 100644
--- a/nuttx/include/nuttx/audio/audio.h
+++ b/nuttx/include/nuttx/audio/audio.h
@@ -532,7 +532,7 @@ struct audio_ops_s
* lower-half driver with the opportunity to perform special buffer
* allocation if needed, such as allocating from a specific memory
* region (DMA-able, etc.). If not supplied, then the top-half
- * driver will perform a standard kumalloc using normal user-space
+ * driver will perform a standard kumm_malloc using normal user-space
* memory region.
*/
diff --git a/nuttx/include/nuttx/kmalloc.h b/nuttx/include/nuttx/kmalloc.h
index 71b0db5f6..050200c8e 100644
--- a/nuttx/include/nuttx/kmalloc.h
+++ b/nuttx/include/nuttx/kmalloc.h
@@ -94,8 +94,8 @@ extern "C"
* directly callable.
*/
-# define kumalloc(s) malloc(s)
-# define kuzalloc(s) zalloc(s)
+# define kumm_malloc(s) malloc(s)
+# define kumm_zalloc(s) zalloc(s)
# define kumm_realloc(p,s) realloc(p,s)
# define kumm_memalign(a,s) memalign(a,s)
# define kumm_free(p) free(p)
@@ -106,8 +106,8 @@ extern "C"
* at the beginning of the user-space blob.
*/
-# define kumalloc(s) umm_malloc(s)
-# define kuzalloc(s) umm_zalloc(s)
+# define kumm_malloc(s) umm_malloc(s)
+# define kumm_zalloc(s) umm_zalloc(s)
# define kumm_realloc(p,s) umm_realloc(p,s)
# define kumm_memalign(a,s) umm_memalign(a,s)
# define kumm_free(p) umm_free(p)
diff --git a/nuttx/libc/lib_internal.h b/nuttx/libc/lib_internal.h
index 8a10a524c..4a7a71e77 100644
--- a/nuttx/libc/lib_internal.h
+++ b/nuttx/libc/lib_internal.h
@@ -94,8 +94,8 @@
/* User-accessible allocations */
-# define lib_umalloc(s) kumalloc(s)
-# define lib_uzalloc(s) kuzalloc(s)
+# define lib_umalloc(s) kumm_malloc(s)
+# define lib_uzalloc(s) kumm_zalloc(s)
# define lib_urealloc(p,s) kumm_realloc(p,s)
# define lib_ufree(p) kumm_free(p)
diff --git a/nuttx/libnx/nxcontext.h b/nuttx/libnx/nxcontext.h
index f128a9173..43dee2593 100644
--- a/nuttx/libnx/nxcontext.h
+++ b/nuttx/libnx/nxcontext.h
@@ -76,8 +76,8 @@
/* User-accessible allocations */
-# define lib_umalloc(s) kumalloc(s)
-# define lib_uzalloc(s) kuzalloc(s)
+# define lib_umalloc(s) kumm_malloc(s)
+# define lib_uzalloc(s) kumm_zalloc(s)
# define lib_urealloc(p,s) kumm_realloc(p,s)
# define lib_ufree(p) kumm_free(p)
diff --git a/nuttx/sched/environ/env_dup.c b/nuttx/sched/environ/env_dup.c
index 91dcaa1dc..90abc1c98 100644
--- a/nuttx/sched/environ/env_dup.c
+++ b/nuttx/sched/environ/env_dup.c
@@ -101,7 +101,7 @@ int env_dup(FAR struct task_group_s *group)
/* Yes..The parent task has an environment, duplicate it */
envlen = ptcb->group->tg_envsize;
- envp = (FAR char *)kumalloc(envlen);
+ envp = (FAR char *)kumm_malloc(envlen);
if (!envp)
{
ret = -ENOMEM;
diff --git a/nuttx/sched/environ/env_setenv.c b/nuttx/sched/environ/env_setenv.c
index 7a7259c51..92b118cfc 100644
--- a/nuttx/sched/environ/env_setenv.c
+++ b/nuttx/sched/environ/env_setenv.c
@@ -173,7 +173,7 @@ int setenv(FAR const char *name, FAR const char *value, int overwrite)
else
{
newsize = varlen;
- newenvp = (FAR char *)kumalloc(varlen);
+ newenvp = (FAR char *)kumm_malloc(varlen);
if (!newenvp)
{
ret = ENOMEM;
diff --git a/nuttx/sched/group/group_create.c b/nuttx/sched/group/group_create.c
index 1aaf6acba..4e1867dfc 100644
--- a/nuttx/sched/group/group_create.c
+++ b/nuttx/sched/group/group_create.c
@@ -199,7 +199,7 @@ int group_allocate(FAR struct task_tcb_s *tcb)
*/
group->tg_streamlist = (FAR struct streamlist *)
- kuzalloc(sizeof(struct streamlist));
+ kumm_zalloc(sizeof(struct streamlist));
if (!group->tg_streamlist)
{