diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-31 17:26:36 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-31 17:26:36 -0600 |
| commit | 39c90ce1ce01a0b45451df19c1635240d47aaf29 (patch) | |
| tree | 3814c0a5ce1961e161e268801e0529a926100ffb /nuttx/arch/avr | |
| parent | e4f3869daedaf22dd224285cc7f0373e0a5025d2 (diff) | |
| download | nuttx-39c90ce1ce01a0b45451df19c1635240d47aaf29.tar.gz nuttx-39c90ce1ce01a0b45451df19c1635240d47aaf29.tar.bz2 nuttx-39c90ce1ce01a0b45451df19c1635240d47aaf29.zip | |
Rename kmalloc to kmm_malloc for consistency
Diffstat (limited to 'nuttx/arch/avr')
| -rw-r--r-- | nuttx/arch/avr/src/at90usb/at90usb_usbdev.c | 4 | ||||
| -rw-r--r-- | nuttx/arch/avr/src/avr32/up_createstack.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/arch/avr/src/at90usb/at90usb_usbdev.c b/nuttx/arch/avr/src/at90usb/at90usb_usbdev.c index 7e9e37555..29cb0f980 100644 --- a/nuttx/arch/avr/src/at90usb/at90usb_usbdev.c +++ b/nuttx/arch/avr/src/at90usb/at90usb_usbdev.c @@ -2287,7 +2287,7 @@ static FAR struct usbdev_req_s *avr_epallocreq(FAR struct usbdev_ep_s *ep) #endif usbtrace(TRACE_EPALLOCREQ, ((FAR struct avr_ep_s *)ep)->ep.eplog); - privreq = (FAR struct avr_req_s *)kmalloc(sizeof(struct avr_req_s)); + privreq = (FAR struct avr_req_s *)kmm_malloc(sizeof(struct avr_req_s)); if (!privreq) { usbtrace(TRACE_DEVERROR(AVR_TRACEERR_ALLOCFAIL), 0); @@ -2339,7 +2339,7 @@ static void *avr_epallocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes) #ifdef CONFIG_USBDEV_DMAMEMORY return usbdev_dma_alloc(bytes); #else - return kmalloc(bytes); + return kmm_malloc(bytes); #endif } #endif diff --git a/nuttx/arch/avr/src/avr32/up_createstack.c b/nuttx/arch/avr/src/avr32/up_createstack.c index 10895e98f..a8e2bfeb7 100644 --- a/nuttx/arch/avr/src/avr32/up_createstack.c +++ b/nuttx/arch/avr/src/avr32/up_createstack.c @@ -132,7 +132,7 @@ 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 *)kzalloc(stack_size); #else - tcb->stack_alloc_ptr = (uint32_t *)kmalloc(stack_size); + tcb->stack_alloc_ptr = (uint32_t *)kmm_malloc(stack_size); #endif } else |